[Rt-commit] [svn] r1140 - in rt/branches/rt-3.1/html: Elements Search Ticket/Elements

[alexmv at pallas.eruditorum.org]

Author: alexmv
Date: Wed Jun 23 17:33:28 2004
New Revision: 1140

Modified:
   rt/branches/rt-3.1/html/Elements/TicketList
   rt/branches/rt-3.1/html/Search/Edit.html
   rt/branches/rt-3.1/html/Search/Results.html
   rt/branches/rt-3.1/html/Ticket/Elements/Tabs
Log:
 * Maintain Order and OrderBy across more links -- most importantly,
   the "prev/next" ones


Modified: rt/branches/rt-3.1/html/Elements/TicketList
==============================================================================
--- rt/branches/rt-3.1/html/Elements/TicketList	(original)
+++ rt/branches/rt-3.1/html/Elements/TicketList	Wed Jun 23 17:33:28 2004
@@ -45,14 +45,20 @@
 <&|/l, $Page, int($TotalFound/$Rows)+1&>Page [_1] of [_2]</&>
 
 <%perl>
-my $prev =  $m->comp('/Elements/QueryString', Query => $Query,
-                                Format => $Format,
-                                Rows => $Rows,
-                                Page => ($Page-1));
-my $next =  $m->comp('/Elements/QueryString', Query => $Query,
-                                Format => $Format,
-                                Rows => $Rows,
-                                Page => ($Page+1));
+my $prev =  $m->comp('/Elements/QueryString',
+                     Query => $Query,
+                     Format => $Format,
+                     Rows => $Rows,
+                     OrderBy => $OrderBy,
+                     Order => $Order,
+                     Page => ($Page-1));
+my $next =  $m->comp('/Elements/QueryString',
+                     Query => $Query,
+                     Format => $Format,
+                     Rows => $Rows,
+                     OrderBy => $OrderBy,
+                     Order => $Order,
+                     Page => ($Page+1));
 </%perl>
 % if ($Page > 1) {
 <A href="<%$BaseURL%><%$prev%>"><&|/l&>Previous Page</&></a>
@@ -432,7 +438,7 @@
 $Title => 'Ticket Search'
 $Collection => undef
 $AllowSorting => undef
-$Order =>undef
+$Order => undef
 $OrderBy => undef
 $BaseURL => undef
 $Format => $RT::DefaultSearchResultFormat

Modified: rt/branches/rt-3.1/html/Search/Edit.html
==============================================================================
--- rt/branches/rt-3.1/html/Search/Edit.html	(original)
+++ rt/branches/rt-3.1/html/Search/Edit.html	Wed Jun 23 17:33:28 2004
@@ -27,7 +27,9 @@
     Title => $title,
     Format => $Format,
     Query => $Query,
-    Rows => $ARGS{'Rows'} &>
+    Rows => $ARGS{'Rows'},
+    OrderBy => $ARGS{'OrderBy'},
+    Order => $ARGS{'Order'} &>
 
 <& Elements/NewListActions, actions => \@actions &>
 
@@ -43,7 +45,13 @@
 <%INIT>
 my $title = loc("Edit Query");
 $Format = $m->comp('/Elements/ScrubHTML', Content => $Format);
-my $QueryString = $m->comp('/Elements/QueryString', Query=>$Query,Format=>$Format,Rows=>$ARGS{'Rows'});
+my $QueryString = $m->comp('/Elements/QueryString',
+                           Query   => $Query,
+                           Format  => $Format,
+                           Rows    => $ARGS{'Rows'},
+                           OrderBy => $ARGS{'OrderBy'},
+                           Order   => $ARGS{'Order'},
+                          );
 
 </%INIT>
 

Modified: rt/branches/rt-3.1/html/Search/Results.html
==============================================================================
--- rt/branches/rt-3.1/html/Search/Results.html	(original)
+++ rt/branches/rt-3.1/html/Search/Results.html	Wed Jun 23 17:33:28 2004
@@ -27,7 +27,9 @@
     Title => $title,
     Format => $Format,
     Query => $Query,
-    Rows => $ARGS{'Rows'} &>
+    Rows => $ARGS{'Rows'},
+    OrderBy => $ARGS{'OrderBy'},
+    Order => $ARGS{'Order'} &>
 <hr>
 <& /Elements/TicketList, 
     Query => $Query,
@@ -64,10 +66,12 @@
 }
 
 my $QueryString = "?".$m->comp('/Elements/QueryString',
-				Query => $Query,
-				Format => $Format,
-				Rows => $ARGS{'Rows'},
-				Page => $ARGS{'Page'});	
+                               Query => $Query,
+                               Format => $Format,
+                               Rows => $ARGS{'Rows'},
+                               OrderBy => $ARGS{'OrderBy'},
+                               Order => $ARGS{'Order'},
+                               Page => $ARGS{'Page'});
 
 
 

Modified: rt/branches/rt-3.1/html/Ticket/Elements/Tabs
==============================================================================
--- rt/branches/rt-3.1/html/Ticket/Elements/Tabs	(original)
+++ rt/branches/rt-3.1/html/Ticket/Elements/Tabs	Wed Jun 23 17:33:28 2004
@@ -159,9 +159,11 @@
 
 my $args = "?" . $m->comp(
     '/Elements/QueryString',
-    Query  => $ARGS{'Query'}  || $session{'CurrentSearchHash'}->{'Query'},
-    Format => $ARGS{'Format'} || $session{'CurrentSearchHash'}->{'Format'},
-    Rows   => $ARGS{'Rows'},
+    Query   => $ARGS{'Query'}  || $session{'CurrentSearchHash'}->{'Query'},
+    Format  => $ARGS{'Format'} || $session{'CurrentSearchHash'}->{'Format'},
+    OrderBy => $ARGS{'OrderBy'},
+    Order   => $ARGS{'Order'},
+    Rows    => $ARGS{'Rows'},
   ) if ($ARGS{'Query'} or $session{'CurrentSearchHash'}->{'Query'});
 
 $tabs->{"f"} = { path      => "Search/Build.html?NewQuery=1",