[Rt-commit] [svn] r865 - in rt/trunk: . bin html/Search

[jesse at pallas.eruditorum.org]

Author: jesse
Date: Tue May 11 02:42:01 2004
New Revision: 865

Modified:
   rt/trunk/   (props changed)
   rt/trunk/bin/rt.in
   rt/trunk/html/Search/Listing.html
Log:
 ----------------------------------------------------------------------
 r1117 at Jesse-Vincents-Computer:  jesse | 2004-05-11T06:41:01.215469Z
 
 Updated "order" handling in the cli from ams
 
 ----------------------------------------------------------------------
 r1118 at Jesse-Vincents-Computer:  jesse | 2004-05-11T06:41:36.770412Z
 
 Better handling of search listing page after a redirect
 ----------------------------------------------------------------------


Modified: rt/trunk/bin/rt.in
==============================================================================
--- rt/trunk/bin/rt.in	(original)
+++ rt/trunk/bin/rt.in	Tue May 11 02:42:01 2004
@@ -170,8 +170,9 @@
 
 sub list {
     my ($q, $type, %data, $orderby);
-    $orderby = $config{orderby};
-    
+    if ($config{orderby}) {
+         $data{orderby} = $config{orderby};
+    } 
     my $bad = 0;
 
     while (@ARGV) {
@@ -184,7 +185,7 @@
             $bad = 1, last unless get_var_argument(\%data);
         }
         elsif (/^-o$/) {
-            $orderby = shift @ARGV;
+            $data{'orderby'} = shift @ARGV;
         }
         elsif (/^-([isl])$/) {
             $data{format} = $1;
@@ -206,9 +207,8 @@
         }
     }
     
-    if (!defined $q)
-    {
-        $q = $config{query} ; 
+    if (!defined $q) {
+        $q = $config{query}; 
     }
     
     $type ||= "ticket";
@@ -219,7 +219,7 @@
     }
     return help("list", $type) if $bad;
 
-    my $r = submit("$REST/search/$type", { query => $q, %data, orderby => $data{orderby} || "" });
+    my $r = submit("$REST/search/$type", { query => $q, %data });
     print $r->content;
 }
 

Modified: rt/trunk/html/Search/Listing.html
==============================================================================
--- rt/trunk/html/Search/Listing.html	(original)
+++ rt/trunk/html/Search/Listing.html	Tue May 11 02:42:01 2004
@@ -37,16 +37,16 @@
 </TABLE>
 <div align=center>
 <font size=2>
-<a href="Listing.html?GotoPage=1"><&|/l&>First page</&></a>
+<a href="<%$RT::WebPath%>/Search/Listing.html?GotoPage=1"><&|/l&>First page</&></a>
 &nbsp;&nbsp;
 %  if ( $session{'tickets'}->FirstRow >= $session{'tickets_rows_per_page'}-1 ) {
-<a href="Listing.html?GotoPage=Prev">&lt;<&|/l&>Previous page</&></a>
+<a href="<%$RT::WebPath%>/Search/Listing.html?GotoPage=Prev">&lt;<&|/l&>Previous page</&></a>
 &nbsp;&nbsp;
 %  }                                                                           
 %  if ( $session{'tickets'}->FirstRow + $session{'tickets_rows_per_page'} < $ticketcount ) {                                                               
-<a href="Listing.html?GotoPage=Next"><&|/l&>Next page</&>&gt;</a>
+<a href="<%$RT::WebPath%>/Search/Listing.html?GotoPage=Next"><&|/l&>Next page</&>&gt;</a>
 %  }
-%#&nbsp;&nbsp;<form method=get action="Listing.html"><&|/l&>Goto page</&> <input name=GotoPage size=2></form>
+%#&nbsp;&nbsp;<form method=get action="<%$RT::WebPath%>/Search/Listing.html"><&|/l&>Goto page</&> <input name=GotoPage size=2></form>
 </font>
 </div>
 <!--<div align=right>-->