[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki: [13083] branches/1.10

[<sy...@us...>]

Revision: 13083
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13083&view=rev
Author:   sylvieg
Date:     2008-06-02 07:38:26 -0700 (Mon, 02 Jun 2008)

Log Message:
-----------
[FIX]tracker: wordcount on textarea displays an error if limit exceeded + displayed at first display

Modified Paths:
--------------
    branches/1.10/lib/tiki-js.js
    branches/1.10/lib/trackers/trackerlib.php
    branches/1.10/templates/tiki-view_tracker_item.tpl
    branches/1.10/templates/tracker_item_field_input.tpl
    branches/1.10/tiki-view_tracker_item.php

Modified: branches/1.10/lib/tiki-js.js
===================================================================
--- branches/1.10/lib/tiki-js.js	2008-06-02 13:05:05 UTC (rev 13082)
+++ branches/1.10/lib/tiki-js.js	2008-06-02 14:38:26 UTC (rev 13083)
@@ -1217,7 +1217,8 @@
 /* Count the number of words (spearated with space) */
 function wordCount(maxSize, source, cpt, message) {
 	var formcontent = source.value;
-	formcontent = formcontent.split(" ");
+	str = formcontent.replace(/^\s+|\s+$/g, '') ;
+	formcontent = str.split(/[^\S]+/);
 	document.getElementById(cpt).value = formcontent.length;
 	if (maxSize > 0 && formcontent.length > maxSize) {
         alert(message);

Modified: branches/1.10/lib/trackers/trackerlib.php
===================================================================
--- branches/1.10/lib/trackers/trackerlib.php	2008-06-02 13:05:05 UTC (rev 13082)
+++ branches/1.10/lib/trackers/trackerlib.php	2008-06-02 14:38:26 UTC (rev 13083)
@@ -1621,6 +1621,12 @@
 					}
 				}
 				break;
+				case 'a':
+					if (isset($f['options_array'][5]) &&  $f['options_array'][5] > 0) {
+						if (count(preg_split('/\s+/', $f['value'])) > $f['options_array'][5]) {
+							$erroneous_values[] = $f;
+						}
+					}
 				}
 			}
 		}

Modified: branches/1.10/templates/tiki-view_tracker_item.tpl
===================================================================
--- branches/1.10/templates/tiki-view_tracker_item.tpl	2008-06-02 13:05:05 UTC (rev 13082)
+++ branches/1.10/templates/tiki-view_tracker_item.tpl	2008-06-02 14:38:26 UTC (rev 13083)
@@ -231,7 +231,7 @@
 			{elseif $tiki_p_tracker_vote_ratings eq 'y'}
 				<td>
 					{section name=i loop=$cur_field.options_array}
-						{if $cur_field.options_array[i] eq $item['my_rate']}
+						{if $cur_field.options_array[i] eq $item.my_rate}
 							<input name="newItemRate" checked="checked" type="radio" value="{$cur_field.options_array[i]|escape}" />{$cur_field.options_array[i]}
 						{else}
 							<input name="newItemRate" type="radio" value="{$cur_field.options_array[i]|escape}" />{$cur_field.options_array[i]}

Modified: branches/1.10/templates/tracker_item_field_input.tpl
===================================================================
--- branches/1.10/templates/tracker_item_field_input.tpl	2008-06-02 13:05:05 UTC (rev 13082)
+++ branches/1.10/templates/tracker_item_field_input.tpl	2008-06-02 14:38:26 UTC (rev 13083)
@@ -14,7 +14,7 @@
 {* -------------------- system -------------------- *}
 {elseif $field_value.type eq 's' and ($field_value.name eq "Rating" or $field_value.name eq tra("Rating")) and $tiki_p_tracker_vote_ratings eq 'y'}
 	{section name=i loop=$field_value.options_array}
-		<input name="{$field_value.ins_id}"{if $field_value.options_array[i] eq $item['my_rate']} checked="checked"{/if} type="radio" value="{$field_value.options_array[i]|escape}" />{$field_value.options_array[i]}
+		<input name="{$field_value.ins_id}"{if $field_value.options_array[i] eq $item.my_rate} checked="checked"{/if} type="radio" value="{$field_value.options_array[i]|escape}" />{$field_value.options_array[i]}
 	{/section}
 
 {* -------------------- user selector -------------------- *}
@@ -185,11 +185,11 @@
 		{if $prefs.quicktags_over_textarea eq 'y' and $field_value.options_array[0] eq 1}
     		{include file=tiki-edit_help_tool.tpl qtnum=$field_value.fieldId area_name="area_"|cat:$field_value.fieldId}
 			{/if}
-		<textarea id="area_{$field_value.fieldId}" name="{$field_value.ins_id}" cols="{if $field_value.options_array[1] gt 1}{$field_value.options_array[1]}{else}50{/if}" rows="{if $field_value.options_array[2] gt 1}{$field_value.options_array[2]}{else}4{/if}"{if $field_value.options_array[5]} onKeyUp="wordCount({$field_value.options_array[5]}, this, 'cpt_{$field_value.fieldId}', '{tr}Word Limit Exceeded{/tr}')" onfocus="wordCount({$field_value.options_array[5]}, this, 'cpt_{$field_value.fieldId}', '{tr}Word Limit Exceeded{/tr}')"{/if}>
+		<textarea id="area_{$field_value.fieldId}" name="{$field_value.ins_id}" cols="{if $field_value.options_array[1] gt 1}{$field_value.options_array[1]}{else}50{/if}" rows="{if $field_value.options_array[2] gt 1}{$field_value.options_array[2]}{else}4{/if}"{if $field_value.options_array[5]} onKeyUp="wordCount({$field_value.options_array[5]}, this, 'cpt_{$field_value.fieldId}', '{tr}Word Limit Exceeded{/tr}')"{/if}>
 			{$field_value.value}
 		</textarea>
 		{if $field_value.options_array[5]}
-			<div class="wordCount">{tr}Word Count:{/tr} <input type="text" id="cpt_{$field_value.fieldId}" size="4" readOnly=true />{if $field_value.options_array[5] > 0} {tr}Max:{/tr} {$field_value.options_array[5]}{/if}</div>
+			<div class="wordCount">{tr}Word Count:{/tr} <input type="text" id="cpt_{$field_value.fieldId}" size="4" readOnly=true{if !empty($field_value.value)} value="{$field_value.value|count_words}"{/if} />{if $field_value.options_array[5] > 0} {tr}Max:{/tr} {$field_value.options_array[5]}{/if}</div>
 		{/if}
 	{else}
 		<table>
@@ -200,10 +200,10 @@
 				{if $prefs.quicktags_over_textarea eq 'y' and $field_value.options_array[0] eq 1}
         			{include file=tiki-edit_help_tool.tpl qtnum=$field_value.id area_name=area_`$field_value.id`_`$ling.lang`}
         		{/if}
-				<textarea id="area_{$field_value.id}_{$ling.lang}" name="{$field_value.ins_id}" cols="{if $field_value.options_array[1] gt 1}{$field_value.options_array[1]}{else}50{/if}" rows="{if $field_value.options_array[2] gt 1}{$field_value.options_array[2]}{else}4{/if}"{if $field_value.options_array[5] > 0} onKeyUp="wordCount({$field_value.options_array[5]}, this, 'cpt_{$field_value.fieldId}_{$ling.lang}', '{tr}Word Limit Exceeded{/tr}')" onfocus="wordCount({$field_value.options_array[5]}, this, 'cpt_{$field_value.fieldId}', '{tr}Word Limit Exceeded{/tr}')"{/if}>
+				<textarea id="area_{$field_value.id}_{$ling.lang}" name="{$field_value.ins_id}" cols="{if $field_value.options_array[1] gt 1}{$field_value.options_array[1]}{else}50{/if}" rows="{if $field_value.options_array[2] gt 1}{$field_value.options_array[2]}{else}4{/if}"{if $field_value.options_array[5] > 0} onKeyUp="wordCount({$field_value.options_array[5]}, this, 'cpt_{$field_value.fieldId}_{$ling.lang}', '{tr}Word Limit Exceeded{/tr}')"{/if}>
 					{$ling.value|escape}
 				</textarea>
-				{if $field_value.options_array[5]}<div class="wordCount">{tr}Word Count:{/tr} <input type="text" id="cpt_{$field_value.fieldId}_{$ling.lang}" size="4" readOnly=true />{if $field_value.options_array[5] > 0}{tr}Max:{/tr} {$field_value.options_array[5]}{/if}</div>{/if}
+				{if $field_value.options_array[5]}<div class="wordCount">{tr}Word Count:{/tr} <input type="text" id="cpt_{$field_value.fieldId}_{$ling.lang}" size="4" readOnly=true{if !empty($ling.value)} value="{$ling.value|count_words}"{/if} />{if $field_value.options_array[5] > 0}{tr}Max:{/tr} {$field_value.options_array[5]}{/if}</div>{/if}
       		</td>
     	</tr>
 		{/foreach}
@@ -244,9 +244,9 @@
 {* -------------------- jscalendar ------------------- *}
 {elseif $field_value.type eq 'j'}
 	{if $field_value.options_array[0] eq 'd'}
-		{jscalendar date=$field_value.value id=$field_value.ins_id fieldname=$field_value.ins_id showtime="n"}
+		{jscalendar date=$field_value.value|default:$smarty.now id=$field_value.ins_id fieldname=$field_value.ins_id showtime="n"}
 	{else}
-		{jscalendar date=$field_value.value id=$field_value.ins_id fieldname=$field_value.ins_id showtime="y"}
+		{jscalendar date=$field_value.value|default:$smarty.now id=$field_value.ins_id fieldname=$field_value.ins_id showtime="y"}
 		{/if}
 
 {* -------------------- item link -------------------- *}
@@ -254,12 +254,14 @@
 	<select name="{$field_value.ins_id}" {if $field_value.http_request}onchange="selectValues('trackerIdList={$field_value.http_request[0]}&amp;fieldlist={$field_value.http_request[3]}&amp;filterfield={$field_value.http_request[1]}&amp;status={$field_value.http_request[4]}&amp;mandatory={$field_value.http_request[6]}&amp;filtervalue={$field_value.value}{$field_value.http_request[5]}')"{/if}>
 		{if $field_value.isMandatory ne 'y'}<option value=""></option>{/if}
 		{foreach key=id item=label from=$field_value.list}
-			<option value="{$label|escape}" {if $field_value.value eq $label or $field_value.defaultvalue eq $label}selected="selected"{/if}>
+			<option value="{$label|escape}" {if $input_err and $field_value.value eq $label or $defaultvalues.$fid eq $label or $field_value.defaultvalue eq $label}selected="selected"{/if}>
 				{if $field_value.displayedList.$id eq ''}{$label}{else}{$field_value.displayedList.$id}{/if}
 			</option>
 		{/foreach}
 	</select>
 
+{* -------------------- item list -------------------- *}
+
 {* -------------------- dynamic list -------------------- *}
 {elseif $field_value.type eq 'w'}
 	<select name="{$field_value.ins_id}" {if $field_value.http_request}onchange="selectValues('trackerIdList={$field_value.http_request[0]}&amp;fieldlist={$field_value.http_request[3]}&amp;filterfield={$field_value.http_request[1]}&amp;status={$field_value.http_request[4]}&amp;mandatory={$field_value.http_request[6]}&amp;filtervalue={$field_value.value}{$field_value.http_request[5]}')"{/if}>

Modified: branches/1.10/tiki-view_tracker_item.php
===================================================================
--- branches/1.10/tiki-view_tracker_item.php	2008-06-02 13:05:05 UTC (rev 13082)
+++ branches/1.10/tiki-view_tracker_item.php	2008-06-02 14:38:26 UTC (rev 13083)
@@ -897,7 +897,7 @@
 				        } else {
 					     $ins_fields["data"][$i]["value"] = $info["$fid"];
 					     $ins_fields["data"][$i]["pvalue"] = $tikilib->parse_data(htmlspecialchars($info["$fid"]));
-					}
+						}
 				} elseif ($fields['data'][$i]['type'] == 'p' && !empty($itemUser)) {
 					if ($fields['data'][$i]['options_array'][0] == 'email')
 						$ins_fields['data'][$i]['value'] = $userlib->get_user_email($itemUser);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.