[Rt-commit] [svn] r1434 - in rtir/branches/1.1/html/RTIR: .
Elements Incident Report Search
leira at pallas.eruditorum.org
leira at pallas.eruditorum.org
Tue Sep 7 02:43:00 EDT 2004
Author: leira
Date: Tue Sep 7 02:43:00 2004
New Revision: 1434
Modified:
rtir/branches/1.1/html/RTIR/Elements/ChildSummary
rtir/branches/1.1/html/RTIR/Elements/QueueTabs
rtir/branches/1.1/html/RTIR/Incident/LinkToIncident.html
rtir/branches/1.1/html/RTIR/Merge.html
rtir/branches/1.1/html/RTIR/Report/BulkReject.html
rtir/branches/1.1/html/RTIR/Search/Refine.html
rtir/branches/1.1/html/RTIR/Search/Results.html
Log:
Regular results has a "refine" for consistency.
Don't use Build.html, since Refine.html has become a more generalized version of it.
Note: Elements/ChildSummary still calls Build.html
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 Tue Sep 7 02:43:00 2004
@@ -58,7 +58,7 @@
% }
<tr>
<td colspan=5>
-[<a href="<%$RT::WebPath%>/RTIR/Search/Build.html?Queue=<%$Queue%><%$QueryString%>"><%loc("Refine Search")%></a>]
+[<a href="<%$RT::WebPath%>/RTIR/Search/Refine.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%>&Query=Content LIKE '<%$q%>'&id=<%$ticket%>"><%loc("Bulk Link")%></a>]
Modified: rtir/branches/1.1/html/RTIR/Elements/QueueTabs
==============================================================================
--- rtir/branches/1.1/html/RTIR/Elements/QueueTabs (original)
+++ rtir/branches/1.1/html/RTIR/Elements/QueueTabs Tue Sep 7 02:43:00 2004
@@ -195,19 +195,21 @@
$mytab = $current_tab;
}
+my $refinetabs = { };
+
+$refinetabs->{'_a'} = {
+ class => "nav",
+ path => 'RTIR/Search/Refine.html?ResultPage=/RTIR/Search/Results.html&Queue=' . $QueueName . $QueryString,
+ title => loc('Refine')
+};
+
$tabs->{"A"} = { path => 'RTIR/Create.html?Queue=' . $QueueName,
title => loc("New $Type") };
-$tabs->{"e"} = { path => 'RTIR/Search/Build.html?Queue=' . $QueueName . '&NewQuery=1',
- title => loc('New Query'),
- subtabs => $searchtabs };
-$tabs->{"f"} = { path => 'RTIR/Search/Build.html?Queue=' . $QueueName . $QueryString,
- title => loc('Query Builder'),
- separator => 1,
- subtabs => $searchtabs };
+
$tabs->{"g"} = { path => 'RTIR/Search/Results.html?Queue=' . $QueueName . $QueryString,
title => loc('Results'),
separator => 1,
- subtabs => $searchtabs };
+ subtabs => $refinetabs };
if ($Type eq 'Report') {
$tabs->{"h"} = { path => 'RTIR/Report/BulkReject.html',
Modified: rtir/branches/1.1/html/RTIR/Incident/LinkToIncident.html
==============================================================================
--- rtir/branches/1.1/html/RTIR/Incident/LinkToIncident.html (original)
+++ rtir/branches/1.1/html/RTIR/Incident/LinkToIncident.html Tue Sep 7 02:43:00 2004
@@ -48,7 +48,8 @@
Query => $Query,
QueryString => $QueryString,
BaseURL => $BaseURL,
- %ARGS &>
+ Format => $Format,
+ &>
<& /Elements/Submit, Name => "SubmitTicket", Caption => $SubmitCaption, Label => loc("Link") &>
</form>
@@ -57,7 +58,6 @@
<%INIT>
$Format = $RT::RTIRLinkIncidentSearchResultFormat;
-$ARGS{'Format'} = $Format;
my ($Type, undef) = $m->comp('/RTIR/Elements/Type', Queue => 'Incidents');
@@ -88,9 +88,11 @@
}
$Query = "$BaseQuery AND ( $Query )";
-$ARGS{'Query'} = $Query;
-my $path = "RTIR/Search/Refine.html?ResultPage=$BaseURL&Queue=Incidents&id=$id$QueryString",
+my $current_tab = "RTIR/Incident/LinkToIncident.html?id=9";
+my $tab = $m->interp->apply_escapes($current_tab,'u');
+
+my $path = "RTIR/Search/Refine.html?ResultPage=$BaseURL&Queue=Incidents&id=$id¤t_tab=$tab$QueryString",
</%INIT>
Modified: rtir/branches/1.1/html/RTIR/Merge.html
==============================================================================
--- rtir/branches/1.1/html/RTIR/Merge.html (original)
+++ rtir/branches/1.1/html/RTIR/Merge.html Tue Sep 7 02:43:00 2004
@@ -24,9 +24,11 @@
%# END LICENSE BLOCK
<& /Elements/Header, Title => $title, Refresh => $session{'tickets_refresh_interval'} &>
+Merge Ticket: <%$id%><br>
<& '/RTIR/Search/Elements/RefineTabs',
path => $path,
- Ticket => $Ticket,
+ Ticket => $Ticket,
+ id => $id,
current_subtab => "RTIR/Merge.html?id=".$Ticket->Id. "$QueryString",
Queue => $Queue,
Title => $title,
@@ -104,7 +106,7 @@
$Query = "$BaseQuery AND ( $Query )";
-my $path = "RTIR/Search/Refine.html?ResultPage=$BaseURL&Queue=" . $Ticket->QueueObj->Name . "&id=$id&$QueryString";
+my $path = "RTIR/Search/Refine.html?ResultPage=$BaseURL¤t_tab=$current_tab&Queue=" . $Ticket->QueueObj->Name . "&id=$id&$QueryString";
</%INIT>
@@ -119,4 +121,5 @@
$Order => 'ASC'
$id => undef
$BaseURL => '/RTIR/Merge.html'
+$current_tab => 'RTIR/Merge.html'
</%ARGS>
Modified: rtir/branches/1.1/html/RTIR/Report/BulkReject.html
==============================================================================
--- rtir/branches/1.1/html/RTIR/Report/BulkReject.html (original)
+++ rtir/branches/1.1/html/RTIR/Report/BulkReject.html Tue Sep 7 02:43:00 2004
@@ -123,7 +123,7 @@
$Query = "$BaseQuery AND ( $Query )";
-my $path = "RTIR/Search/Refine.html?ResultPage=$BaseURL&Queue=$Queue$QueryString";
+my $path = "RTIR/Search/Refine.html?ResultPage=$BaseURL¤t_tab=$current_tab&Queue=$Queue$QueryString";
</%INIT>
Modified: rtir/branches/1.1/html/RTIR/Search/Refine.html
==============================================================================
--- rtir/branches/1.1/html/RTIR/Search/Refine.html (original)
+++ rtir/branches/1.1/html/RTIR/Search/Refine.html Tue Sep 7 02:43:00 2004
@@ -45,13 +45,13 @@
%# }}} END BPS TAGGED BLOCK
<& /Elements/Header, Title => $title &>
-ResultPage: <%$ResultPage%><br>
+Passing Ticket: <%$Ticket%><br>
<& '/RTIR/Search/Elements/RefineTabs',
path => $path,
current_tab => $current_tab,
- current_subtab => $ResultPage."?Queue=$Queue&id=".$id.$QueryString,
+ current_subtab => $current_subtab,
Ticket => $Ticket,
- Queue => 'Incident Reports',
+ Queue => $Queue,
Title => $title,
Format => $Format,
Query => $Query,
@@ -59,10 +59,9 @@
OrderBy => $OrderBy,
Order => $Order,
QueryString => $QueryString,
+ id => $id,
&>
-Refine.html<br>
-
<& /RTIR/Search/Elements/BuildQuery,
queues => \%queues,
actions => $results,
@@ -78,7 +77,7 @@
<%INIT>
if (!$Ticket && $id) {
- my $Ticket = new RT::Ticket($session{'CurrentUser'});
+ $Ticket = new RT::Ticket($session{'CurrentUser'});
$Ticket->Load($id);
}
@@ -146,11 +145,12 @@
$ARGS{'Query'} = $Query;
my $path = $BaseURL."?Queue=$Queue&id=".$id.$QueryString;
+
</%INIT>
<%ARGS>
$Ticket => undef
-$title => loc("Query Builder")
+$title => loc("Refine Search")
$ResultPage => undef
$BaseURL => 'RTIR/Search/Refine.html'
$NewQuery => 0
@@ -166,4 +166,5 @@
$OrderBy => 'id'
$Order => 'ASC'
$current_tab => undef
+$current_subtab => undef
</%ARGS>
Modified: rtir/branches/1.1/html/RTIR/Search/Results.html
==============================================================================
--- rtir/branches/1.1/html/RTIR/Search/Results.html (original)
+++ rtir/branches/1.1/html/RTIR/Search/Results.html Tue Sep 7 02:43:00 2004
@@ -56,8 +56,6 @@
&>
<hr>
-Results!<br>
-
<& Elements/ShowResults,
Query => $Query,
QueryString => $QueryString,
More information about the Rt-commit
mailing list