[Rt-commit] [svn] r1135 - rt/branches/rt-3.1/html/Search

[alexmv at pallas.eruditorum.org]

Author: alexmv
Date: Tue Jun 22 17:16:41 2004
New Revision: 1135

Modified:
   rt/branches/rt-3.1/html/Search/Build.html
Log:
 * Do the search _after_ any modifications are passed in -- this
   allows executing searches from a (relatively) simple URL.


Modified: rt/branches/rt-3.1/html/Search/Build.html
==============================================================================
--- rt/branches/rt-3.1/html/Search/Build.html	(original)
+++ rt/branches/rt-3.1/html/Search/Build.html	Tue Jun 22 17:16:41 2004
@@ -115,13 +115,6 @@
 # Clean unwanted junk from the format
 $Format = $m->comp('/Elements/ScrubHTML', Content => $Format) if ($Format);
 
-# {{{ At this point, just do the search if asked
-if ( $ARGS{"DoSearch"} ) {
-    $m->comp("Results.html" , Query => $Query, Format => $Format, OrderBy => $ARGS{OrderBy}, Rows => $ARGS{RowsPerPage});
-    $m->abort();
-}
-# }}}
-
 # {{{ If we're asked to delete the current search, make it go away and reset the search parameters
 if ( $ARGS{'Delete'} ) {
     if ( $SearchId =~ /^(.*?)-(\d+)-SavedSearch-(\d+)$/ ) {
@@ -733,6 +726,13 @@
 
 # }}}
 
+# {{{ Show the results, if we were asked.
+if ( $ARGS{"DoSearch"} ) {
+    $m->comp("Results.html" , Query => $Query, Format => $Format, OrderBy => $ARGS{OrderBy}, Rows => $ARGS{RowsPerPage});
+    $m->abort();
+}
+# }}}
+
 # {{{ Build a querystring for the tabs
 
 my $QueryString;