[Rt-commit] [svn] r1429 - in rtir/branches/1.1/html/RTIR: Elements Incident Incident/Elements

[leira at pallas.eruditorum.org]

Author: leira
Date: Mon Sep  6 23:23:39 2004
New Revision: 1429

Modified:
   rtir/branches/1.1/html/RTIR/Elements/ChildSummary
   rtir/branches/1.1/html/RTIR/Incident/Elements/BulkLink
   rtir/branches/1.1/html/RTIR/Incident/LinkChildren.html
Log:
Get rid of old-style search args in ChildSummary.

Fix end-to-end arg passing for "bulk link" from the Lookup page.


Modified: rtir/branches/1.1/html/RTIR/Elements/ChildSummary
==============================================================================
--- rtir/branches/1.1/html/RTIR/Elements/ChildSummary	(original)
+++ rtir/branches/1.1/html/RTIR/Elements/ChildSummary	Mon Sep  6 23:23:39 2004
@@ -58,10 +58,10 @@
 % }
 <tr>
 <td colspan=5>
-[<a href="<%$RT::WebPath%>/RTIR/Search/Results.html?Queue=<%$Queue%><%$QueryString%>"><%loc("Refine Search")%></a>]
+[<a href="<%$RT::WebPath%>/RTIR/Search/Build.html?Queue=<%$Queue%><%$QueryString%>"><%loc("Refine Search")%></a>]
 % if ($Type eq 'Incident') {
 % if ($Queue) {
-[<a href="<%$RT::WebPath%>/RTIR/Incident/LinkChildren.html?ClearRestrictions=1&Queue=<%$Queue%>&AttachmentField=Content&AttachmentFieldOp=LIKE&ValueOfAttachmentField=<%$q%>&id=<%$ticket%>"><%loc("Bulk Link")%></a>]
+[<a href="<%$RT::WebPath%>/RTIR/Incident/LinkChildren.html?ClearRestrictions=1&Queue=<%$Queue%>&Query=Content LIKE '<%$q%>'&id=<%$ticket%>"><%loc("Bulk Link")%></a>]
 % }
 %   if ($Queue eq 'Investigations' and $lookuptype eq 'email') {
 <br>[<a href="<%$RT::WebPath%>/RTIR/Create.html?Incident=<%$ticket%>&Requestors=<%$q%>&Queue=Investigations"><%loc("Launch new: [_1]", $q)%></a>]

Modified: rtir/branches/1.1/html/RTIR/Incident/Elements/BulkLink
==============================================================================
--- rtir/branches/1.1/html/RTIR/Incident/Elements/BulkLink	(original)
+++ rtir/branches/1.1/html/RTIR/Incident/Elements/BulkLink	Mon Sep  6 23:23:39 2004
@@ -26,12 +26,14 @@
 <input type=hidden name=id value=<%$id%>>
 <input type=hidden name=BulkLink value=1>
 
+Query: <%$Query%><br>
 <& /RTIR/Search/Elements/ShowResults, 
     Queue => $Queue,
     Query => $Query,
     QueryString => $QueryString, 
     BaseURL => $BaseURL,
-    %ARGS &>
+    Format => $Format,
+&>
 
 <& /Elements/Submit, Name => "SubmitTicket", Caption => $SubmitCaption, Label => loc("Link") &>
 </form>
@@ -67,6 +69,7 @@
     $title = loc("Find tickets");
 }
 
+$m->print("Original Query: $Query<br>");
 if (!$Query) {
     $Query = $m->comp('/RTIR/Elements/NewQuery', Queue => $Queue);
 }

Modified: rtir/branches/1.1/html/RTIR/Incident/LinkChildren.html
==============================================================================
--- rtir/branches/1.1/html/RTIR/Incident/LinkChildren.html	(original)
+++ rtir/branches/1.1/html/RTIR/Incident/LinkChildren.html	Mon Sep  6 23:23:39 2004
@@ -30,17 +30,18 @@
     Queue => $Queue,
     Ticket => $IncidentObj, 
     current_subtab => 'RTIR/Incident/LinkChildren.html?ClearRestrictions=1&id='.$IncidentObj->id.'&Queue='.$Queue,
-    Tab => loc('Link [_1]', $Queue);
+    Tab => loc('Link [_1]', $Queue),
     Title => $title,
  &>
 
 <& Elements/BulkLink,
+    Query => $Query,
     SubmitCaption => $SubmitCaption, 
     id => $id,
     Status => 'open',
     BaseURL => "/RTIR/Incident/LinkChildren.html",
     Queue => $Queue,
-    %ARGS &>
+    &>
 
 <%INIT>
 my $IncidentObj = LoadTicket($id);
@@ -52,4 +53,5 @@
 <%ARGS>
 $id => undef
 $Queue => undef
+$Query => undef
 </%ARGS>