[freeside-commits] freeside/rt/share/html/Search/Elements BuildFormatString, 1.5, 1.6 ConditionRow, 1.1.1.2, 1.2 PickBasics, 1.1.1.2, 1.2

[Mark Wells]

Update of /home/cvs/cvsroot/freeside/rt/share/html/Search/Elements
In directory wavetail.420.am:/tmp/cvs-serv30419/rt/share/html/Search/Elements

Modified Files:
	BuildFormatString ConditionRow PickBasics 
Log Message:
improve customer field access in RT queries, #16490

Index: PickBasics
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/share/html/Search/Elements/PickBasics,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -w -d -r1.1.1.2 -r1.2
--- PickBasics	17 Feb 2011 00:25:14 -0000	1.1.1.2
+++ PickBasics	19 Feb 2012 00:34:44 -0000	1.2
@@ -209,6 +209,9 @@
     },
 );
 
+#freeside
+push @lines, $m->comp('/Elements/CustomerFields', 'PickBasics');
+
 $m->callback( Conditions => \@lines );
 
 </%INIT>

Index: BuildFormatString
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/share/html/Search/Elements/BuildFormatString,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -d -r1.5 -r1.6
--- BuildFormatString	17 Feb 2012 02:35:27 -0000	1.5
+++ BuildFormatString	19 Feb 2012 00:34:35 -0000	1.6
@@ -69,11 +69,15 @@
 # it -- and it grows per request.
 
 # All the things we can display in the format string by default
-my @fields = qw(
+# referenced by their ColumnMap keys
+my @fields = (
+  qw(
     id QueueName Subject
+  ),
 
-    Customer Agent CustomerClass CustomerTags AdvertisingSource
+    $m->comp('/Elements/CustomerFields', 'Names'), #freeside
 
+  qw(
     Status ExtendedStatus UpdateStatus
     Type
 
@@ -99,7 +103,7 @@
     Bookmark
 
     NEWLINE
-
+  )
 ); # loc_qw
 
 $m->callback( CallbackOnce => 1, CallbackName => 'SetFieldsOnce', Fields => \@fields );

Index: ConditionRow
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/share/html/Search/Elements/ConditionRow,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -w -d -r1.1.1.2 -r1.2
--- ConditionRow	17 Feb 2011 00:25:14 -0000	1.1.1.2
+++ ConditionRow	19 Feb 2012 00:34:35 -0000	1.2
@@ -82,7 +82,8 @@
         my $res = '';
         $res .= qq{<select id="$name" name="$name">};
         my @options = @{ $box->{'Options'} };
-        while( my $k = shift @options ) {
+        while( @options ) {
+            my $k = shift @options;
             my $v = shift @options;
             $res .= qq{<option value="$k">$v</option>};
         }