[Rt-commit] [svn] r1651 - in rt/branches/3.2-RELEASE: . html/Search

[jesse at pallas.eruditorum.org]

Author: jesse
Date: Tue Oct 12 19:36:59 2004
New Revision: 1651

Modified:
   rt/branches/3.2-RELEASE/   (props changed)
   rt/branches/3.2-RELEASE/html/Search/Results.html
Log:
 r1650 at tinbook:  jesse | 2004-10-10T04:23:58.456281Z
 
 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.2-RELEASE/html/Search/Results.html
==============================================================================
--- rt/branches/3.2-RELEASE/html/Search/Results.html	(original)
+++ rt/branches/3.2-RELEASE/html/Search/Results.html	Tue Oct 12 19:36:59 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()) {