[Rt-commit] [svn] r973 - in rt/trunk: . html/Search lib/RT

[robert at pallas.eruditorum.org]

Author: robert
Date: Fri May 28 00:47:37 2004
New Revision: 973

Modified:
   rt/trunk/   (props changed)
   rt/trunk/html/Search/Listing.html
   rt/trunk/lib/RT/Tickets_Overlay_SQL.pm
Log:
 
 ----------------------------------------------------------------------
 r551 at bear:  rspier | 2004-05-28T04:39:20.863505Z
 
  Re: [fsck.com #5639] SearchBuilder doesn't properly paginate initial s\
 earches
 ----------------------------------------------------------------------


Modified: rt/trunk/html/Search/Listing.html
==============================================================================
--- rt/trunk/html/Search/Listing.html	(original)
+++ rt/trunk/html/Search/Listing.html	Fri May 28 00:47:37 2004
@@ -96,6 +96,7 @@
     }
     if ( ($ARGS{'ClearRestrictions'}) || ($ARGS{'NewSearch'}) ) {
 	    $session{'tickets'}->ClearRestrictions;
+	    $session{'tickets'}->CleanSlate;
 	}	
 }
    ProcessSearchQuery(ARGS=>\%ARGS);

Modified: rt/trunk/lib/RT/Tickets_Overlay_SQL.pm
==============================================================================
--- rt/trunk/lib/RT/Tickets_Overlay_SQL.pm	(original)
+++ rt/trunk/lib/RT/Tickets_Overlay_SQL.pm	Fri May 28 00:47:37 2004
@@ -443,6 +443,11 @@
   my ($self,$query) = @_;
 
   $self->CleanSlate;
+  {
+    # preserve first_row and show_rows across the CleanSlate
+    local($self->{'first_row'}, $self->{'show_rows'});
+    $self->CleanSlate;
+  }
   $self->_InitSQL();
 
   return (1,$self->loc("No Query")) unless $query;