[Rt-commit] r2823 - in rt/branches/CHALDEA-EXPERIMENTAL: . bin etc/upgrade html/Search

[autrijus at bestpractical.com]

Author: autrijus
Date: Tue May  3 04:30:52 2005
New Revision: 2823

Modified:
   rt/branches/CHALDEA-EXPERIMENTAL/   (props changed)
   rt/branches/CHALDEA-EXPERIMENTAL/bin/webmux.pl.in   (props changed)
   rt/branches/CHALDEA-EXPERIMENTAL/etc/upgrade/   (props changed)
   rt/branches/CHALDEA-EXPERIMENTAL/html/Search/Build.html
Log:
 r16386 at not (orig r2818):  jesse | 2005-04-30 12:35:01 +0800
  r14630 at hualien:  jesse | 2005-04-30 00:25:00 -0400
  * Better defaulting for searching for  'no rows per page'
  
 


Modified: rt/branches/CHALDEA-EXPERIMENTAL/html/Search/Build.html
==============================================================================
--- rt/branches/CHALDEA-EXPERIMENTAL/html/Search/Build.html	(original)
+++ rt/branches/CHALDEA-EXPERIMENTAL/html/Search/Build.html	Tue May  3 04:30:52 2005
@@ -139,10 +139,21 @@
 $SearchId    ||= $search_hash->{'SearchId'} || 'new';
 $Order       ||= $search_hash->{'Order'} || $prefs->{'Order'} || 'ASC';
 $OrderBy     ||= $search_hash->{'OrderBy'} || $prefs->{'OrderBy'} || 'id';
-$RowsPerPage = ( $search_hash->{'RowsPerPage'} || $prefs->{'RowsPerPage'} 
-                                               || 50 )
-  unless defined($RowsPerPage);
-$search ||= $search_hash->{'Object'};
+
+unless ( defined $RowsPerPage ) {
+    if ( defined $search_hash->{'RowsPerPage'} ) {
+        $RowsPerPage = $search_hash->{'RowsPerPage'};
+    }
+    elsif ( defined $prefs->{'RowsPerPage'} ) {
+        $RowsPerPage = $prefs->{'RowsPerPage'};
+    }
+    else {
+        $RowsPerPage = 50;
+    }
+}
+
+  $search ||= $search_hash->{'Object'};
+
 
 # }}}