[Rt-commit] [svn] r1694 - in rt/branches/3.3-TESTING: . html/Search

[jesse at pallas.eruditorum.org]

Author: jesse
Date: Wed Oct 27 04:05:10 2004
New Revision: 1694

Modified:
   rt/branches/3.3-TESTING/   (props changed)
   rt/branches/3.3-TESTING/html/Search/Results.html
Log:
 r6117 at tinbook:  jesse | 2004-10-27T07:55:31.185793Z
  r1994 at tinbook:  jesse | 2004-10-12T23:37:37.775608Z
  Improved "stickiness" of queries.
  Next/Prev navigation should be more consistently available now.
  Most recent query should be available more consistently.
  
 


Modified: rt/branches/3.3-TESTING/html/Search/Results.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Search/Results.html	(original)
+++ rt/branches/3.3-TESTING/html/Search/Results.html	Wed Oct 27 04:05:10 2004
@@ -88,17 +88,19 @@
 <%INIT>
 my ($title, $ticketcount);
 $session{'i'}++;
-$session{'tickets'} = RT::Tickets->new($session{'CurrentUser'})  unless ($session{'tickets'});
+$session{'tickets'} = RT::Tickets->new($session{'CurrentUser'}) ;
 $session{'tickets'}->FromSQL($Query) if ($Query);
 $session{'tickets'}->OrderBy(FIELD => $OrderBy, ORDER => $Order); 
 
-if ($OrderBy ne $session{'CurrentSearchHash'}->{'OrderBy'}
-    or $Order ne $session{'CurrentSearchHash'}->{'Order'}) {
-    $session{'CurrentSearchHash'}->{'OrderBy'} = $OrderBy;
-    $session{'CurrentSearchHash'}->{'Order'}   = $Order;
-    # Invalidate the ordering cache
-    undef $session{'tickets'}->{'items_array'};
-}
+
+$session{'CurrentSearchHash'} = {
+    Format      => $Format,
+    Query       => $Query,
+    Order       => $Order,
+    OrderBy     => $OrderBy,
+    RowsPerPage => $Rows
+    } unless ($session{'CurrentSearchHash'} && $session{'CurrentSearchHash'}->{Query} eq $Query);
+
 
 
 if ( $session{'tickets'}->Query()) {