[Rt-commit] r7911 - in rt/branches/3.7-EXPERIMENTAL-TUNIS: . html/Admin/CustomFields html/Admin/Elements html/Elements html/SelfService html/User html/User/Groups

clsung at bestpractical.com clsung at bestpractical.com
Wed May 23 10:22:43 EDT 2007


Author: clsung
Date: Wed May 23 10:22:36 2007
New Revision: 7911

Modified:
   rt/branches/3.7-EXPERIMENTAL-TUNIS/   (props changed)
   rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Admin/CustomFields/Objects.html
   rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Admin/Elements/SelectCustomFieldLookupType
   rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Admin/Elements/SelectTemplate
   rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Admin/Global/Template.html
   rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Elements/SelectLang
   rt/branches/3.7-EXPERIMENTAL-TUNIS/html/SelfService/Display.html
   rt/branches/3.7-EXPERIMENTAL-TUNIS/html/User/Groups/Modify.html
   rt/branches/3.7-EXPERIMENTAL-TUNIS/html/User/Prefs.html

Log:
 r1085 at going04:  clsung | 2007-05-22 14:34:26 +0800
 - fix the warning of not using defined($Default) && ....
   - Use of uninitialized value in join or string at html/Elements/SelectLang line 53,
 - correct indent '}'
 r1086 at going04:  clsung | 2007-05-22 14:51:13 +0800
 - give $LookupType a default value when undef
 r7469 at going04:  clsung | 2007-05-23 22:19:53 +0800
 - give lots of default ('') value
 r7470 at going04:  clsung | 2007-05-23 22:20:54 +0800
 - check defined()


Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Admin/CustomFields/Objects.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Admin/CustomFields/Objects.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Admin/CustomFields/Objects.html	Wed May 23 10:22:36 2007
@@ -69,7 +69,7 @@
 <%INIT>
 my $CF = RT::CustomField->new($session{'CurrentUser'});
 $CF->Load($id) or Abort(loc("Could not load CustomField [_1]"), $id);
-my $LookupType = $CF->LookupType;
+my $LookupType = $CF->LookupType || '';
 $LookupType =~ /^(.*?)-/ ||
      Abort(loc("Object of type [_1] cannot take custom fields", $LookupType));
 

Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Admin/Elements/SelectCustomFieldLookupType
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Admin/Elements/SelectCustomFieldLookupType	(original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Admin/Elements/SelectCustomFieldLookupType	Wed May 23 10:22:36 2007
@@ -47,7 +47,7 @@
 %# END BPS TAGGED BLOCK }}}
 <select NAME ="<%$Name%>">
 %for my $option ($cf->LookupTypes) {
-<option value="<%$option%>" <%$option eq $Default ? "SELECTED" : ''%>><% $cf->FriendlyLookupType($option) %></option>
+<option value="<%$option%>" <%defined ($Default) && ($option eq $Default) && "SELECTED"%>><% $cf->FriendlyLookupType($option) %></option>
 %}
 </select>
 <%INIT>

Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Admin/Elements/SelectTemplate
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Admin/Elements/SelectTemplate	(original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Admin/Elements/SelectTemplate	Wed May 23 10:22:36 2007
@@ -47,7 +47,7 @@
 %# END BPS TAGGED BLOCK }}}
 <select name="<%$Name%>">
 <option value="" 
-<% $Default eq 'none' && 'SELECTED' %>
+<% defined($Default) && $Default eq 'none' && 'SELECTED' %>
 >-</option>
 %while  (my $Template = $PrimaryTemplates->Next) {
 <option value="<%$Template->Id%>"
@@ -57,7 +57,7 @@
 %}
 %while  (my $Template = $OtherTemplates->Next) {
 <option value="<%$Template->Id%>"
-<% ($Template->Id == $Default)  && 'SELECTED'%>
+<% defined($Default) && ($Template->Id == $Default)  && 'SELECTED'%>
 ><&|/l, loc($Template->Name) &>Global template: [_1]</&>
 </option>
 %}

Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Admin/Global/Template.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Admin/Global/Template.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Admin/Global/Template.html	Wed May 23 10:22:36 2007
@@ -93,7 +93,7 @@
 }
 
 else {
-  if ($Template eq 'new') {
+  if (defined ($Template) && $Template eq 'new') {
       my ($val, $msg) =  $TemplateObj->Create(Queue => $Queue, Name => $Name);
       Abort(loc("Could not create template: [_1]", $msg)) unless ($val);
      push @results, $msg;

Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Elements/SelectLang
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Elements/SelectLang	(original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Elements/SelectLang	Wed May 23 10:22:36 2007
@@ -50,10 +50,10 @@
 <option value="">-</option>
 % }
 % foreach my $lang (@lang) {
-<option value="<%$lang%>" <%($Default && ($lang eq $Default)) && 'SELECTED'%>><% $lang_to_desc{$lang} %>
+<option value="<%$lang%>" <%(defined($Default) && ($lang eq $Default)) && 'SELECTED'%>><% $lang_to_desc{$lang} %>
 %   if (($Verbose) and (my $description = I18N::LangTags::List::native_name($lang)) ){
 (<%$description%>)
-%  }
+%   }
 </option>
 % }
 </select>

Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/html/SelfService/Display.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/html/SelfService/Display.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/html/SelfService/Display.html	Wed May 23 10:22:36 2007
@@ -120,7 +120,7 @@
         $ARGS{'Attach'} => $attachment };
 }
 
-if ( $id[0] eq 'new' ) {
+if ( defined ($id[0]) && $id[0] eq 'new' ) {
 
     # {{{ Create a new ticket
 

Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/html/User/Groups/Modify.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/html/User/Groups/Modify.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/html/User/Groups/Modify.html	Wed May 23 10:22:36 2007
@@ -90,7 +90,7 @@
     $title = loc("Create a new personal group");
 } 
 else {
-    if ( $id eq 'new' ) {
+    if ( defined ($id) && $id eq 'new' ) {
 
         my ( $id, $msg ) = $Group->CreatePersonalGroup(
                              Name        => "$Name",

Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/html/User/Prefs.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/html/User/Prefs.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/html/User/Prefs.html	Wed May 23 10:22:36 2007
@@ -72,7 +72,7 @@
     <td class="value"><input name="RealName" value="<%$UserObj->RealName%>" /></td>  </tr>
   <tr>
     <td class="label"><&|/l&>Nickname</&>:</td>
-    <td class="value"><input name="NickName" value="<%$UserObj->NickName%>" /></td>
+    <td class="value"><input name="NickName" value="<%$UserObj->NickName || ''%>" /></td>
   </tr>
   <tr>
     <td class="label"><&|/l&>Language</&>:</td>
@@ -84,19 +84,19 @@
 <table cellspacing="0" cellpadding="0">
   <tr>
     <td class="label"><&|/l&>Residence</&>:</td>
-    <td class="value"><input name="HomePhone" value="<%$UserObj->HomePhone%>" size="13" /></td>
+    <td class="value"><input name="HomePhone" value="<%$UserObj->HomePhone || ''%>" size="13" /></td>
   </tr>
   <tr>
     <td class="label"><&|/l&>Work</&>:</td>
-    <td class="value"><input name="WorkPhone" value="<%$UserObj->WorkPhone%>" size="13" /></td>
+    <td class="value"><input name="WorkPhone" value="<%$UserObj->WorkPhone || ''%>" size="13" /></td>
   </tr>
   <tr>
     <td class="label"><&|/l&>Mobile</&>:</td>
-    <td class="value"><input name="MobilePhone" value="<%$UserObj->MobilePhone%>" size="13" /></td>
+    <td class="value"><input name="MobilePhone" value="<%$UserObj->MobilePhone || ''%>" size="13" /></td>
   </tr>
   <tr>
     <td class="label"><&|/l&>Pager</&>:</td>
-    <td class="value"><input name="PagerPhone" value="<%$UserObj->PagerPhone%>" size="13" /></td>
+    <td class="value"><input name="PagerPhone" value="<%$UserObj->PagerPhone || ''%>" size="13" /></td>
   </tr>
 </table>
 </&>
@@ -129,31 +129,31 @@
 <table cellspacing="0" cellpadding="0">
   <tr>
     <td class="label"><&|/l&>Organization</&>:</td>
-    <td class="value"><input name="Organization" value="<%$UserObj->Organization%>" /></td>
+    <td class="value"><input name="Organization" value="<%$UserObj->Organization || ''%>" /></td>
   </tr>
   <tr>
     <td class="label"><&|/l&>Address1</&>:</td>
-    <td class="value"><input name="Address1" value="<%$UserObj->Address1%>" /></td>
+    <td class="value"><input name="Address1" value="<%$UserObj->Address1 || ''%>" /></td>
   </tr>
   <tr>
     <td class="label"><&|/l&>Address2</&>:</td>
-    <td class="value"><input name="Address2" value="<%$UserObj->Address2%>" /></td>
+    <td class="value"><input name="Address2" value="<%$UserObj->Address2 || ''%>" /></td>
   </tr>
   <tr>
     <td class="label"><&|/l&>City</&>:</td>
-    <td><input name="City" value="<%$UserObj->City%>" size="14" /></td>
+    <td><input name="City" value="<%$UserObj->City || ''%>" size="14" /></td>
   </tr>
   <tr>
     <td class="label"><&|/l&>State</&>:</td>
-    <td class="value"><input name="State" value="<%$UserObj->State%>" size="3" /></td>
+    <td class="value"><input name="State" value="<%$UserObj->State || ''%>" size="3" /></td>
   </tr>
   <tr>
     <td class="label"><&|/l&>Zip</&>:</td>
-    <td class="value"><input name="Zip" value="<%$UserObj->Zip%>" size="9" /></td>
+    <td class="value"><input name="Zip" value="<%$UserObj->Zip || ''%>" size="9" /></td>
   </tr>
   <tr>
     <td class="label"><&|/l&>Country</&>:</td>
-    <td class="value"><input name="Country" value="<%$UserObj->Country%>" /></td>
+    <td class="value"><input name="Country" value="<%$UserObj->Country || ''%>" /></td>
   </tr>
 </table>
 </&>
@@ -169,7 +169,7 @@
 <br />
 <&| /Widgets/TitleBox, title => loc('Signature') &>
 <textarea cols="80" rows="5" name="Signature" class="signature" wrap="hard">
-<%$UserObj->Signature%></textarea>
+<%$UserObj->Signature || ''%></textarea>
 </&>
 % }
 


More information about the Rt-commit mailing list