[Rt-commit] r5095 - in rt/branches/3.7-EXPERIMENTAL: .

[ruz at bestpractical.com]

Author: ruz
Date: Tue Apr 25 08:48:11 2006
New Revision: 5095

Modified:
   rt/branches/3.7-EXPERIMENTAL/   (props changed)
   rt/branches/3.7-EXPERIMENTAL/html/Prefs/Search.html
   rt/branches/3.7-EXPERIMENTAL/html/Prefs/SearchOptions.html

Log:
 r2175 at cubic-pc (orig r4783):  ruz | 2006-03-21 03:26:00 +0300
 * fix for multiple OrderBy on edit
 ** backport r4622 from 3.7


Modified: rt/branches/3.7-EXPERIMENTAL/html/Prefs/Search.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Prefs/Search.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Prefs/Search.html	Tue Apr 25 08:48:11 2006
@@ -75,7 +75,7 @@
 my $title = loc("Customize").' ';
 
 my @fields = qw(Format Order OrderBy RowsPerPage);
-my ($class, $id) = $ARGS{name} =~ m/^(.*)-(\d+)$/;
+my ($class, $id) = ( $ARGS{name} =~ m/^(.*)-(\d+)$/ );
 
 Abort('No search specified')
     unless $class eq 'RT::Attribute';
@@ -90,6 +90,9 @@
 for (@fields) {
     $ARGS{$_} = $SearchArg->{$_} unless defined $ARGS{$_};
 }
+$ARGS{'Order'} = join '|', grep defined && /\S/, (ref $ARGS{'Order'})? @{$ARGS{'Order'}}: $ARGS{'Order'};
+$ARGS{'OrderBy'} = join '|', grep defined && /\S/, (ref $ARGS{'OrderBy'})? @{$ARGS{'OrderBy'}}: $ARGS{'OrderBy'};
+
 my ( $AvailableColumns, $CurrentFormat );
 ( $ARGS{Format}, $AvailableColumns, $CurrentFormat ) = $m->comp(
     '/Search/Elements/BuildFormatString',

Modified: rt/branches/3.7-EXPERIMENTAL/html/Prefs/SearchOptions.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Prefs/SearchOptions.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Prefs/SearchOptions.html	Tue Apr 25 08:48:11 2006
@@ -64,6 +64,8 @@
 <%INIT>
 
 # {{{ If we're saving search preferences, do that now
+$Order = join '|', grep defined && /\S/, (ref $Order)? @{$Order}: $Order;
+$OrderBy = join '|', grep defined && /\S/, (ref $OrderBy)? @{$OrderBy}: $OrderBy;
 
 $Order       = (ref $Order   ? join('|',grep {/\S/} @{$Order})   : $Order);
 $OrderBy     = (ref $OrderBy ? join('|',grep {/\S/} @{$OrderBy}) : $OrderBy);
@@ -85,7 +87,7 @@
 $Format      ||= $prefs->{'Format'};
 $Order       ||= ($prefs->{'Order'} || 'ASC');
 $OrderBy     ||= ($prefs->{'OrderBy'} || 'id');
-($RowsPerPage =  defined( $prefs->{'RowsPerPage'}) ? $prefs->{'RowsPerPage'}  : 50) unless defined ($RowsPerPage);
+($RowsPerPage =  defined( $prefs->{'RowsPerPage'} ) ? $prefs->{'RowsPerPage'}  : 50) unless defined ($RowsPerPage);
 
 my ( $AvailableColumns, $CurrentFormat );
 ( $Format, $AvailableColumns, $CurrentFormat ) = $m->comp(