[Rt-commit] r2806 - in rt/branches/QUEBEC-EXPERIMENTAL: . html/Elements html/Prefs

[jesse at bestpractical.com]

Author: jesse
Date: Mon Apr 25 14:14:28 2005
New Revision: 2806

Modified:
   rt/branches/QUEBEC-EXPERIMENTAL/   (props changed)
   rt/branches/QUEBEC-EXPERIMENTAL/html/Elements/QueueSummary
   rt/branches/QUEBEC-EXPERIMENTAL/html/Prefs/SearchOptions.html
Log:
 r14502 at hualien:  jesse | 2005-04-25 14:12:59 -0400
 * Small bugs fixed in Saved search prefs.
 


Modified: rt/branches/QUEBEC-EXPERIMENTAL/html/Elements/QueueSummary
==============================================================================
--- rt/branches/QUEBEC-EXPERIMENTAL/html/Elements/QueueSummary	(original)
+++ rt/branches/QUEBEC-EXPERIMENTAL/html/Elements/QueueSummary	Mon Apr 25 14:14:28 2005
@@ -56,10 +56,10 @@
 %   my $queue_cond = "Queue = '$queue->{Name}' AND ";
 %   my $all_q = $queue_cond . "(Status = 'open' OR Status = 'new' OR Status = 'stalled')";
 <TR class="<% $i%2 ? 'oddline' : 'evenline'%>" >
-<td><A HREF="<% $RT::WebPath%>/Search/Results.html?Query=<%$all_q%>&Rows=50" TITLE="<% $queue->{Description} %>"><%$queue->{Name}%></a></TD>
+<td><A HREF="<% $RT::WebPath%>/Search/Results.html?Query=<%$all_q%>" TITLE="<% $queue->{Description} %>"><%$queue->{Name}%></a></TD>
 %   for my $condition (@$conditions) {
 %       $Tickets->FromSQL($queue_cond.$condition->{cond}), 
-<td align="right"><A HREF="<% $RT::WebPath%>/Search/Results.html?Query=<%$queue_cond.$condition->{cond}%>&Rows=50"><% $Tickets->Count %></a></TD>
+<td align="right"><A HREF="<% $RT::WebPath%>/Search/Results.html?Query=<%$queue_cond.$condition->{cond}%>"><% $Tickets->Count %></a></TD>
 %   }
 </TR>
 % }

Modified: rt/branches/QUEBEC-EXPERIMENTAL/html/Prefs/SearchOptions.html
==============================================================================
--- rt/branches/QUEBEC-EXPERIMENTAL/html/Prefs/SearchOptions.html	(original)
+++ rt/branches/QUEBEC-EXPERIMENTAL/html/Prefs/SearchOptions.html	Mon Apr 25 14:14:28 2005
@@ -69,10 +69,10 @@
 if ($ARGS{'SavePreferences'}) {
     $session{'CurrentUser'}->UserObj->SetPreferences("SearchDisplay",
     {
-       Format      => $Format,
-       Order       => $Order,
-       OrderBy     => $OrderBy,
-       RowsPerPage => $RowsPerPage
+       Format      => $ARGS{'Format'},
+       Order       => $ARGS{'Order'},
+       OrderBy     => $ARGS{'OrderBy'},
+       RowsPerPage => $ARGS{'RowsPerPage'}
     });
 }
 
@@ -88,12 +88,10 @@
 my $prefs = $session{'CurrentUser'}->UserObj->Preferences("SearchDisplay") || {}
 ;
 
-$Format      ||= $ARGS{'Format'} || $prefs->{'Format'};
-$Order       ||= $ARGS{'Order'} || $prefs->{'Order'} || 'ASC';
-$OrderBy     ||= $ARGS{'OrderBy'} || $prefs->{'OrderBy'} || 'id';
-$RowsPerPage = ( $ARGS{'RowsPerPage'} || $prefs->{'RowsPerPage'}
-                                               || 50 )
-  unless defined($RowsPerPage);
+$Format      = $prefs->{'Format'};
+$Order       = $prefs->{'Order'} || 'ASC';
+$OrderBy     = $prefs->{'OrderBy'} || 'id';
+$RowsPerPage =  defined( $prefs->{'RowsPerPage'}) ? $prefs->{'RowsPerPage'}  : 50;
 
 my ( $AvailableColumns, $CurrentFormat );
 ( $Format, $AvailableColumns, $CurrentFormat ) = $m->comp(