[Rt-commit] [svn] r1410 - rtir/branches/1.1/html/RTIR/Search

[leira at pallas.eruditorum.org]

Author: leira
Date: Thu Sep  2 19:43:50 2004
New Revision: 1410

Modified:
   rtir/branches/1.1/html/RTIR/Search/LinkRefine.html
   rtir/branches/1.1/html/RTIR/Search/MergeRefine.html
Log:
These two files look much more like each other now.

Soon, they will be the same file, with arguments.


Modified: rtir/branches/1.1/html/RTIR/Search/LinkRefine.html
==============================================================================
--- rtir/branches/1.1/html/RTIR/Search/LinkRefine.html	(original)
+++ rtir/branches/1.1/html/RTIR/Search/LinkRefine.html	Thu Sep  2 19:43:50 2004
@@ -46,9 +46,9 @@
 <& /Elements/Header, Title => $title &>
 
 <& '/RTIR/Search/Elements/RefineTabs',
-   path => "RTIR/Search/LinkRefine.html?Queue=$Queue&id=".$id,
+   path => $path,
    current_tab => "RTIR/Incident/LinkToIncident.html?id=".$id,
-   current_subtab => "RTIR/Search/LinkRefine.html?Queue=$Queue&id=".$id,
+   current_subtab => $ResultPage."?Queue=$Queue&id=".$id.$QueryString,
    ChildObj => $Ticket, 
    Queue => 'Incidents',
    Title => $title,
@@ -58,7 +58,6 @@
    OrderBy => $OrderBy,
    Order => $Order,
    QueryString => $QueryString,
-   id => $id,
 &>
 
 <& /RTIR/Search/Elements/BuildQuery, 
@@ -74,8 +73,6 @@
     %ARGS &>
 
 <%INIT>
-my $title = loc("Query Builder");
-
 my $Ticket = new RT::Ticket($session{'CurrentUser'});
 $Ticket->Load($id);
 
@@ -141,10 +138,14 @@
 # }}}
 
 $ARGS{'Query'} = $Query;
+
+my $path = $BaseURL."?Queue=$Queue&id=".$id.$QueryString;
 </%INIT>
 
 <%ARGS>
+$title => loc("Query Builder")
 $ResultPage => '/RTIR/Incident/LinkToIncident.html'
+$BaseURL => "RTIR/Search/LinkRefine.html"
 $NewQuery => 0
 $Queue => undef
 $Query => undef

Modified: rtir/branches/1.1/html/RTIR/Search/MergeRefine.html
==============================================================================
--- rtir/branches/1.1/html/RTIR/Search/MergeRefine.html	(original)
+++ rtir/branches/1.1/html/RTIR/Search/MergeRefine.html	Thu Sep  2 19:43:50 2004
@@ -46,8 +46,8 @@
 <& /Elements/Header, Title => $title &>
 
 <& '/RTIR/Search/Elements/RefineTabs',
-   path => "RTIR/Search/MergeRefine.html?Queue=$Queue&id=".$id.$QueryString,
-   current_subtab => "RTIR/Merge.html?id=".$id.$QueryString,
+   path => $path,
+   current_subtab => $ResultPage."?Queue=$Queue&id=".$id.$QueryString,
    Ticket => $Ticket, 
    Queue => 'Incidents',
    Title => $title,
@@ -72,8 +72,6 @@
     %ARGS &>
 
 <%INIT>
-my $title = loc("Query Builder");
-
 my $Ticket = new RT::Ticket($session{'CurrentUser'});
 $Ticket->Load($id);
 
@@ -141,15 +139,18 @@
 
 $ARGS{'Query'} = $Query;
 
+my $path = $BaseURL."?Queue=$Queue&id=".$id.$QueryString;
 </%INIT>
 
 <%ARGS>
+$title => loc("Query Builder")
+$ResultPage => '/RTIR/Merge.html'
+$BaseURL => 'RTIR/Search/MergeRefine.html'
 $NewQuery => 0
 $Queue => undef
 $Query => undef
 $id => undef
 $FormAction => 'MergeRefine.html'
-$ResultPage => '/RTIR/Merge.html'
 $Format => undef 
 $HideResults => 0
 $Rows => 50