[Rt-commit] r2818 - in rt/branches/QUEBEC-EXPERIMENTAL: . html/Search

[jesse at bestpractical.com]

Author: jesse
Date: Sat Apr 30 00:35:01 2005
New Revision: 2818

Modified:
   rt/branches/QUEBEC-EXPERIMENTAL/   (props changed)
   rt/branches/QUEBEC-EXPERIMENTAL/html/Search/Build.html
Log:
 r14630 at hualien:  jesse | 2005-04-30 00:25:00 -0400
 * Better defaulting for searching for  'no rows per page'
 


Modified: rt/branches/QUEBEC-EXPERIMENTAL/html/Search/Build.html
==============================================================================
--- rt/branches/QUEBEC-EXPERIMENTAL/html/Search/Build.html	(original)
+++ rt/branches/QUEBEC-EXPERIMENTAL/html/Search/Build.html	Sat Apr 30 00:35:01 2005
@@ -139,10 +139,20 @@
 $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'};
 
 # }}}