[Rt-commit] [svn] r1585 - in rtir/branches/1.1-TESTING/html/RTIR/Search: . Elements

[leira at pallas.eruditorum.org]

Author: leira
Date: Wed Sep 29 19:50:08 2004
New Revision: 1585

Modified:
   rtir/branches/1.1-TESTING/html/RTIR/Search/Elements/BuildQuery
   rtir/branches/1.1-TESTING/html/RTIR/Search/Elements/ProcessQuery
   rtir/branches/1.1-TESTING/html/RTIR/Search/Refine.html
Log:
RT-Ticket: 6055
RT-Status: resolved
RT-Action: correspond
Saved searches now work.


Modified: rtir/branches/1.1-TESTING/html/RTIR/Search/Elements/BuildQuery
==============================================================================
--- rtir/branches/1.1-TESTING/html/RTIR/Search/Elements/BuildQuery	(original)
+++ rtir/branches/1.1-TESTING/html/RTIR/Search/Elements/BuildQuery	Wed Sep 29 19:50:08 2004
@@ -49,9 +49,9 @@
 <input type=hidden name=Query value="<%$Query%>">
 <input type=hidden name=Format value="<%$Format%>">
 <input type=hidden name=BaseQuery value="<%$BaseQuery%>">
-<input type=hidden name=Queue value="<%$ARGS{'Queue'}%>">
-<input type=hidden name=id value="<%$ARGS{'id'}%>">
-<input type=hidden name=ResultPage value="<%$ARGS{'ResultPage'}%>">
+<input type=hidden name=Queue value="<%$Queue%>">
+<input type=hidden name=id value="<%$id%>">
+<input type=hidden name=ResultPage value="<%$ResultPage%>">
 <table width=100%>
 <tr>
 <td valign=top class="boxcontainer">
@@ -79,6 +79,7 @@
 </center>
 <& /Elements/TitleBoxEnd &>
 <br>
+
 <& /Search/Elements/EditSearches, CurrentSearch => $search_hash, Dirty => $dirty, SearchId => $SearchId &>
 </td>
 </tr>
@@ -98,7 +99,7 @@
 </FORM>
 
 <%ARGS>
-$NewQuery => 0
+$id => undef
 $SearchId => undef
 $BaseQuery => undef
 $Query => undef
@@ -116,4 +117,5 @@
 $AvailableColumns => undef
 $CurrentFormat => undef
 $Queue => undef
+$ResultPage => undef
 </%ARGS>

Modified: rtir/branches/1.1-TESTING/html/RTIR/Search/Elements/ProcessQuery
==============================================================================
--- rtir/branches/1.1-TESTING/html/RTIR/Search/Elements/ProcessQuery	(original)
+++ rtir/branches/1.1-TESTING/html/RTIR/Search/Elements/ProcessQuery	Wed Sep 29 19:50:08 2004
@@ -636,7 +636,7 @@
 # }}}
 
 # {{{ If we're modifying an old query, check if it has changed
-$dirty = 1 if defined $search and 
+$$dirty = 1 if defined $search and 
   ($search->SubValue('Format')      ne $Format      or
    $search->SubValue('Query')       ne $Query       or 
    $search->SubValue('Order')       ne $Order       or
@@ -644,6 +644,7 @@
    $search->SubValue('RowsPerPage') ne $RowsPerPage);
 # }}}
 
+
 # {{{ Push the updates into the session so we don't loose 'em
 $search_hash->{'SearchId'} = $SearchId;
 $search_hash->{'Format'} = $Format;
@@ -666,7 +667,7 @@
 
 $$results = \@actions;
 
-return ( $Query, $Format, $Order, $OrderBy, $RowsPerPage );
+return ( $Query, $Format, $Order, $OrderBy, $RowsPerPage, $SearchId );
 
 </%INIT>
 

Modified: rtir/branches/1.1-TESTING/html/RTIR/Search/Refine.html
==============================================================================
--- rtir/branches/1.1-TESTING/html/RTIR/Search/Refine.html	(original)
+++ rtir/branches/1.1-TESTING/html/RTIR/Search/Refine.html	Wed Sep 29 19:50:08 2004
@@ -62,18 +62,30 @@
 &>
 
 <& /RTIR/Search/Elements/BuildQuery, 
+    id => $id,
     queues => \%queues, 
     actions => $results, 
     optionlist => $optionlist,
     search_hash => $search_hash,
-    dirty => $dirty,
     AvailableColumns => $AvailableColumns,
     CurrentFormat => $CurrentFormat,
     BaseQuery => $BaseQuery,
     ResultPage => $ResultPage,
-    %ARGS &>
+    SearchId => $SearchId,
+    NewQuery => $NewQuery,
+    Query => $Query,
+    BaseURL => $BaseURL,
+    Rows => $Rows,
+    Format => $Format,
+    Queue => $Queue,
+    Page => $Page,
+    Order => $Order,
+    OrderBy => $OrderBy,
+    &>
 
 <%INIT>
+my $SearchId;
+
 if (!$Ticket && $id) {
     $Ticket = new RT::Ticket($session{'CurrentUser'});
     $Ticket->Load($id);
@@ -106,15 +118,14 @@
 
     # and replace it with our standard new query...
 
-    $ARGS{'Query'} = $m->comp('/RTIR/Elements/NewQuery', Queue => $Queue);
-    $Query = $ARGS{'Query'};
+    $Query = $m->comp('/RTIR/Elements/NewQuery', Queue => $Queue);
 
     # and claim it isn't a new query any more
 
-    $ARGS{'NewQuery'} = 0;
+    $NewQuery = 0;
 }
 
-( $Query, $Format, $Order, $OrderBy, $Rows ) = 
+( $Query, $Format, $Order, $OrderBy, $Rows, $SearchId ) = 
     $m->comp('/RTIR/Search/Elements/ProcessQuery', 
 	     queues => \%queues, 
 	     results => \$results, 
@@ -140,8 +151,6 @@
             Rows => $Rows) if ($Query);
 # }}}
 
-$ARGS{'Query'} = $Query;
-
 my $path = $BaseURL."?Queue=$Queue&id=".$id.$QueryString;
 
 </%INIT>