[Rt-commit] [svn] r1697 - in rt/branches/3.3-TESTING: . html/Elements

[jesse at pallas.eruditorum.org]

Author: jesse
Date: Wed Oct 27 04:06:29 2004
New Revision: 1697

Modified:
   rt/branches/3.3-TESTING/   (props changed)
   rt/branches/3.3-TESTING/html/Elements/TicketList
Log:
 r6120 at tinbook:  jesse | 2004-10-27T07:55:32.882088Z
  r6109 at tinbook:  jesse | 2004-10-26T20:02:02.857695Z
  Additional fixes for display of unlimited search results
 


Modified: rt/branches/3.3-TESTING/html/Elements/TicketList
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/TicketList	(original)
+++ rt/branches/3.3-TESTING/html/Elements/TicketList	Wed Oct 27 04:06:29 2004
@@ -61,7 +61,7 @@
 </TABLE>
 % }
 
-% if ($ShowNavigation) {
+% if ($Rows && $ShowNavigation) {
 <hr>
 <&|/l, $Page, int($TotalFound/$Rows)+1&>Page [_1] of [_2]</&>
 
@@ -95,7 +95,6 @@
 # Scrub the html of the format string to remove any potential nasties.
 $Format = $m->comp('/Elements/ScrubHTML', Content => $Format);
 
-$Rows ||= '25'; # we need a positive value
 
 unless ($Collection) {
         $Collection = RT::Tickets->new($session{'CurrentUser'});
@@ -105,14 +104,14 @@
 my (@Format) = $m->comp('/Elements/CollectionAsTable/ParseFormat', Format => $Format);
 
 $Collection->OrderBy(FIELD => $OrderBy, ORDER => $Order); 
-$Collection->RowsPerPage($Rows);
+$Collection->RowsPerPage($Rows) if ($Rows);
 $Collection->GotoPage($Page-1); # SB uses page 0 as the first page
 my $TotalFound =  $Collection->CountAll();
 
 </%INIT>
 <%ARGS>
 $Query => undef
-$Rows => 10
+$Rows => 50
 $Page => 1
 $Title => 'Ticket Search'
 $Collection => undef