[Rt-commit] [svn] r1368 - in rtir/branches/1.1/html/RTIR: .
Elements Incident Search/Elements
leira at pallas.eruditorum.org
leira at pallas.eruditorum.org
Fri Aug 27 04:16:25 EDT 2004
Author: leira
Date: Fri Aug 27 04:16:23 2004
New Revision: 1368
Modified:
rtir/branches/1.1/html/RTIR/Create.html
rtir/branches/1.1/html/RTIR/Elements/ChildSummary
rtir/branches/1.1/html/RTIR/Elements/IncidentSummary
rtir/branches/1.1/html/RTIR/Elements/NewReports
rtir/branches/1.1/html/RTIR/Elements/QueueTabs
rtir/branches/1.1/html/RTIR/Incident/Create.html
rtir/branches/1.1/html/RTIR/Incident/LinkToIncident.html
rtir/branches/1.1/html/RTIR/Incident/Reply.html
rtir/branches/1.1/html/RTIR/Merge.html
rtir/branches/1.1/html/RTIR/Search/Elements/BuildQuery
rtir/branches/1.1/html/RTIR/Search/Elements/ProcessQuery
rtir/branches/1.1/html/RTIR/Search/Elements/ShowResults
Log:
Remove more instances of Elements/Listing and Listing.html.
Merge works under the new system now.
Modified: rtir/branches/1.1/html/RTIR/Create.html
==============================================================================
--- rtir/branches/1.1/html/RTIR/Create.html (original)
+++ rtir/branches/1.1/html/RTIR/Create.html Fri Aug 27 04:16:23 2004
@@ -32,14 +32,12 @@
% } elsif ($Incident) {
<& "/RTIR/Incident/Elements/".$Type."Tabs",
Ticket => $IncidentObj,
- current_toptab => "RTIR/Listing.html",
current_tab => "RTIR/Create.html?Incident=".$Incident."&Queue=".$Queue,
current_subtab => "RTIR/Create.html?Incident=".$Incident."&Queue=".$Queue,
Title => $Title &>
% } else {
<& "/RTIR/".$Type."/Elements/Tabs",
Ticket => $TicketObj,
- current_toptab => "RTIR/Listing.html",
current_tab => "RTIR/Create.html?Queue=".$Queue,
current_subtab => "RTIR/Create.html?Queue=".$Queue,
Title => $Title &>
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 Fri Aug 27 04:16:23 2004
@@ -58,7 +58,7 @@
% }
<tr>
<td colspan=5>
-[<a href="<%$RT::WebPath%>/RTIR/Listing.html?ClearRestrictions=1&Queue=<%$Queue%>&AttachmentField=Content&AttachmentFieldOp=LIKE&ValueOfAttachmentField=<%$q%>"><%loc("Refine Search")%></a>]
+[<a href="<%$RT::WebPath%>/RTIR/Search/Results.html?Queue=<%$Queue%><%$QueryString%>"><%loc("Refine Search")%></a>]
% if ($Type eq 'Incident') {
% my $linkfile;
% if ($Queue eq 'Incident Reports') {
@@ -81,10 +81,34 @@
</tr>
</table>
+<%INIT>
+my $Query;
+if (!$Query) {
+ $Query = $m->comp('/RTIR/Elements/NewQuery', Queue => $Queue);
+ $Query .= " AND Content LIKE '$q'" if $q;
+}
+
+my $QueryString = "&".$m->comp('/Elements/QueryString',
+ Query => $Query,
+ Format => $Format,
+ Rows => $Rows,
+ OrderBy => $OrderBy,
+ Order => $Order,
+ Page => $Page);
+
+</%INIT>
+
<%ARGS>
$Queue => undef
$Type => undef
$ticket => undef
$q => undef
$lookuptype => undef
+$Format => undef
+$HideResults => 0
+$Rows => 50
+$Page => 1
+$OrderBy => 'id'
+$Order => 'ASC'
</%ARGS>
+
Modified: rtir/branches/1.1/html/RTIR/Elements/IncidentSummary
==============================================================================
--- rtir/branches/1.1/html/RTIR/Elements/IncidentSummary (original)
+++ rtir/branches/1.1/html/RTIR/Elements/IncidentSummary Fri Aug 27 04:16:23 2004
@@ -62,7 +62,8 @@
% if ($Type eq 'Report' or $Type eq 'Investigation' or $Type eq 'Block') {
[<a href="<%$RT::WebPath%>/RTIR/Create.html?child=<%$ticket%>&Queue=Incidents"><b>New</b></a>]
% }
-[<a href="<%$RT::WebPath%>/RTIR/Listing.html?ClearRestrictions=1&Queue=Incidents&AttachmentField=Content&AttachmentFieldOp=LIKE&ValueOfAttachmentField=<%$q%>"><%loc("Refine Search")%></a>]</td>
+[<a href="<%$RT::WebPath%>/RTIR/Search/Results.html?Queue=Incidents<%$QueryString%>"><%loc("Refine Search")%></a>]
+</td>
</tr>
</table>
@@ -84,10 +85,30 @@
}
}
+my $Query;
+if (!$Query) {
+ $Query = $m->comp('/RTIR/Elements/NewQuery', Queue => $Queue);
+ $Query .= " AND Content LIKE '$q'" if $q;
+}
+
+my $QueryString = "&".$m->comp('/Elements/QueryString',
+ Query => $Query,
+ Format => $Format,
+ Rows => $Rows,
+ OrderBy => $OrderBy,
+ Order => $Order,
+ Page => $Page);
+
</%INIT>
<%ARGS>
$Type => undef
$ticket => undef
$q => undef
+$Format => undef
+$HideResults => 0
+$Rows => 50
+$Page => 1
+$OrderBy => 'id'
+$Order => 'ASC'
</%ARGS>
Modified: rtir/branches/1.1/html/RTIR/Elements/NewReports
==============================================================================
--- rtir/branches/1.1/html/RTIR/Elements/NewReports (original)
+++ rtir/branches/1.1/html/RTIR/Elements/NewReports Fri Aug 27 04:16:23 2004
@@ -23,7 +23,7 @@
%#
%# END LICENSE BLOCK
<& /Elements/TitleBoxStart,
- title_href =>"$RT::WebPath/RTIR/Listing.html?NewSearch=1&Queue=".$QueueObj->Name."&CustomFieldOp$fid==&CustomField$fid=new&TicketsSortBy=Due&TicketSortOrder=ASC&setstate=1",
+ title_href =>"$RT::WebPath/RTIR/Search/Results.html?Queue=$Queue$QueryString",
title_class=> 'inverse',
title => loc("[_1] of [_2] new unlinked Incident Reports...", $num, $MyTickets->Count), bodyclass=> '' &>
<TABLE BORDER=0 cellspacing=0 cellpadding=1 WIDTH=100%>
@@ -79,24 +79,23 @@
<%INIT>
-my $rows = 10;
-my $MyTickets;
-$MyTickets = new RT::Tickets ($session{'CurrentUser'});
-$MyTickets->CleanSlate();
-$MyTickets->LimitQueue(VALUE => 'Incident Reports');
-$MyTickets->OrderBy(FIELD => 'Due', ORDER => 'ASC');
-$MyTickets->LimitStatus(OPERATOR => '!=', VALUE => 'deleted');
-
-my $fid;
-my $QueueObj = new RT::Queue($session{'CurrentUser'});
-if (!$QueueObj->Load("Incident Reports")) {
- $m->print (loc("Error: Incident Reports Queue could not be loaded."));
-} else {
- my $cf = RT::CustomField->new($session{'CurrentUser'});
- $cf->LoadByNameAndQueue(Queue => $QueueObj->Id, Name => '_RTIR_State');
- $MyTickets->LimitCustomField(CUSTOMFIELD => $cf->Id, VALUE => 'new');
+my $Query;
+if (!$Query) {
+ $Query .= "'CF.$Queue.{_RTIR_State}' = 'new'";
}
+my $QueryString = "&".$m->comp('/Elements/QueryString',
+ Query => $Query,
+ Format => $Format,
+ Rows => $Rows,
+ OrderBy => $OrderBy,
+ Order => $Order,
+ Page => $Page);
+
+my $MyTickets;
+my $rows = 10;
+$MyTickets = new RT::Tickets ($session{'CurrentUser'});
+$MyTickets->FromSQL("Queue = '$Queue' AND ($Query)");
$MyTickets->RowsPerPage($rows);
my $num;
@@ -107,3 +106,13 @@
}
</%INIT>
+
+<%ARGS>
+$Queue => 'Incident Reports'
+$Format => undef
+$HideResults => 0
+$Rows => 50
+$Page => 1
+$OrderBy => 'Due'
+$Order => 'ASC'
+</%ARGS>
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 Fri Aug 27 04:16:23 2004
@@ -49,7 +49,7 @@
$mytab = "RTIR/Display.html?id=".$id;
if ( defined $session{'tickets'} ) {
-
+
my $item_map = $session{'tickets'}->ItemMap;
# Don't display prev links if we're on the first ticket
@@ -84,20 +84,38 @@
my $ticket_page_tabs = {
_A => { title => loc('Display'),
- path => "RTIR/Display.html?id=" . $id, },
+ path => "RTIR/Display.html?id=" . $id, }
};
+ if ($Type eq 'Incident') {
+ $ticket_page_tabs->{'_B'} = { title => loc('Incident Reports'),
+ path => "RTIR/Incident/ShowReports.html?id=" . $id, };
+
+ $ticket_page_tabs->{'_C'} = { title => loc('Investigations'),
+ path => "RTIR/Incident/ShowInvestigations.html?id=" . $id, };
+
+ $ticket_page_tabs->{'_D'} = { title => loc('Blocks'),
+ path => "RTIR/Incident/ShowBlocks.html?id=" . $id,
+ separator => 1};
+ };
+
+
# only show edit option if they can do it
if ($Ticket->CurrentUserHasRight('ModifyTicket')) {
- $ticket_page_tabs->{'_B'} = { title => loc('Edit'),
+ $ticket_page_tabs->{'_E'} = { title => loc('Edit'),
path => "RTIR/Edit.html?id=" . $id, };
- $ticket_page_tabs->{'_C'} = { title => loc('Split'),
+ $ticket_page_tabs->{'_F'} = { title => loc('Split'),
path => "RTIR/Split.html?Ticket=" . $id, };
- $ticket_page_tabs->{'_D'} = { title => loc('Merge'),
- path => "RTIR/Merge.html?NewSearch=1&id=" . $id,
- separator => 1 };
+ $ticket_page_tabs->{'_G'} = { title => loc('Merge'),
+ path => "RTIR/Merge.html?NewSearch=1&id=$id" };
+
+ if ($Type ne 'Incident') {
+ $ticket_page_tabs->{'_H'} = { title => loc('Link to Incident'),
+ path => "RTIR/Incident/LinkToIncident.html?id=$id",
+ separator => 1 };
+ }
}
foreach my $tab ( sort keys %{$ticket_page_tabs} ) {
@@ -109,38 +127,64 @@
}
$tabs->{'this'}->{"subtabs"} = $ticket_page_tabs;
+### Reply ###
if ( $Ticket->CurrentUserHasRight('ModifyTicket')
or $Ticket->CurrentUserHasRight('ReplyToTicket') ) {
- $actions->{'A'} = { title => loc('Reply'),
- path => "RTIR/Update.html?Action=Respond&DefaultStatus=stalled&id=" . $id,
- };
-}
-
-if ( $Ticket->CurrentUserHasRight('ModifyTicket') ) {
- if ( $Ticket->Status ne 'resolved' and $Ticket->Status ne 'rejected' ) {
- my $state = $m->scomp("/RTIR/Elements/ShowRTIRField",
- Ticket => $Ticket, Name => 'State');
- $state =~ s/\s+$//;
- if ($state ne 'new') {
- $actions->{'Ac'} = {
-
- path =>
- "RTIR/Update.html?Action=Comment&DefaultStatus=resolved&id=" . $id,
+ } if ($Type eq 'Incident') {
+ $actions->{'A'} = { title => loc('Reply to Reporters'),
+ path => "RTIR/Incident/Reply.html?DefaultStatus=stalled&ClearRestrictions=1&id=".$id,
+ };
+ $actions->{'Ab'} = { title => loc('Reply to All'),
+ path => "RTIR/Incident/Reply.html?DefaultStatus=stalled&ClearRestrictions=1&id=".$id."&All=1",
+ };
+ } else {
+ $actions->{'A'} = { title => loc('Reply'),
+ path => "RTIR/Update.html?Action=Respond&DefaultStatus=stalled&id=" . $id,
+ };
+}
+
+ if ( $Ticket->CurrentUserHasRight('ModifyTicket') ) {
+ if ($Type eq 'Report') {
+ if ( $Ticket->Status ne 'resolved' and $Ticket->Status ne 'rejected' ) {
+ my $state = $m->scomp("/RTIR/Elements/ShowRTIRField",
+ Ticket => $Ticket, Name => 'State');
+ $state =~ s/\s+$//;
+ if ($state ne 'new') {
+ $actions->{'Ac'} = {
+
+ path =>
+ "RTIR/Update.html?Action=Comment&DefaultStatus=resolved&id=" . $id,
+ title => loc('Resolve') };
+ }
+ $actions->{'B'} = { path => "RTIR/Display.html?Status=rejected&id=" . $id,
+ title => loc('Quick Reject') };
+ $actions->{'Bb'} = {
+
+ path =>
+ "RTIR/Update.html?Action=Comment&DefaultStatus=rejected&id=" . $id,
+ title => loc('Reject') };
+ }
+ } elsif ($Type eq 'Incident') {
+
+ if ( $Ticket->Status ne 'resolved' ) {
+ $actions->{'Ac'} = {
+
+ path => "RTIR/Incident/Reply.html?Action=Comment&DefaultStatus=resolved&ClearRestrictions=1&id=".$id."&All=1",
+
title => loc('Resolve') };
+ $actions->{'B'} = {
+ path => "RTIR/Incident/Reply.html?Action=Comment&DefaultStatus=rejected&ClearRestrictions=1&id=".$id."&All=1",
+
+ title => loc('Abandon') };
+ }
+ }
+
+ ### Open ###
+ if ( $Ticket->Status eq 'resolved' or $Ticket->Status eq 'rejected' ) {
+ $actions->{'C'} = { path => "RTIR/Display.html?Status=open&id=" . $id,
+ title => loc('Open') };
}
- $actions->{'B'} = { path => "RTIR/Display.html?Status=rejected&id=" . $id,
- title => loc('Quick Reject') };
- $actions->{'Bb'} = {
-
- path =>
- "RTIR/Update.html?Action=Comment&DefaultStatus=rejected&id=" . $id,
- title => loc('Reject') };
- }
- if ( $Ticket->Status eq 'resolved' or $Ticket->Status eq 'rejected' ) {
- $actions->{'C'} = { path => "RTIR/Display.html?Status=open&id=" . $id,
- title => loc('Open it') };
}
-}
if ( $Ticket->CurrentUserHasRight('OwnTicket') ) {
if ( $Ticket->OwnerObj->id == $RT::Nobody->id ) {
Modified: rtir/branches/1.1/html/RTIR/Incident/Create.html
==============================================================================
--- rtir/branches/1.1/html/RTIR/Incident/Create.html (original)
+++ rtir/branches/1.1/html/RTIR/Incident/Create.html Fri Aug 27 04:16:23 2004
@@ -24,7 +24,6 @@
%# END LICENSE BLOCK
<& /RTIR/Elements/Header, Title => $Title &>
<& /RTIR/Incident/Elements/Tabs,
- current_toptab => "RTIR/Listing.html",
current_tab => $current_tab,
current_subtab => $current_subtab,
Title => $Title,
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 Fri Aug 27 04:16:23 2004
@@ -25,8 +25,10 @@
<& /RTIR/Elements/Header,
Title => $title,
Refresh => $session{'tickets_refresh_interval'} &>
-<& Elements/Tabs,
- current_subtab => 'RTIR/Incident/ShowReports.html',
+<& '/RTIR/'.$Type.'/Elements/Tabs',
+ Ticket => $ChildObj,
+ current_tab => "RTIR/Incident/LinkToIncident.html?id=$id",
+ current_subtab => "RTIR/Incident/LinkToIncident.html?id=$id",
Title => $title &>
<form action='Display.html' method=get>
@@ -40,10 +42,9 @@
<HR>
-<& /RTIR/Elements/SearchFields, Path => '/RTIR/Incident/LinkToIncident.html',
- Queue => $QueueObj->Name, %ARGS &>
-
<%INIT>
+my ($Type, undef) = $m->comp('/RTIR/Elements/Type', Ticket => $id);
+
my $ChildObj = LoadTicket($id);
my $SubmitCaption = loc("Link #[_1] with selected Incident", $ChildObj->id);
Modified: rtir/branches/1.1/html/RTIR/Incident/Reply.html
==============================================================================
--- rtir/branches/1.1/html/RTIR/Incident/Reply.html (original)
+++ rtir/branches/1.1/html/RTIR/Incident/Reply.html Fri Aug 27 04:16:23 2004
@@ -98,11 +98,6 @@
<& /Elements/Submit, Name => "SubmitTicket", Caption => $SubmitCaption, Label => $SubmitLabel &>
</form>
-<HR>
-
-<& /RTIR/Elements/SearchFields, Path => "/RTIR/Incident/Reply.html",
- Queue => $QueueObj->Name, %ARGS &>
-
<%INIT>
my $IncidentObj = LoadTicket($id);
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 Fri Aug 27 04:16:23 2004
@@ -27,6 +27,7 @@
Ticket => $Ticket,
current_tab => "RTIR/Merge.html?NewSearch=1&id=".$Ticket->Id,
current_subtab => "RTIR/Merge.html?NewSearch=1&id=".$Ticket->Id,
+ subtabs => $mergetabs,
Title => $Title &>
<& /RTIR/Elements/ListActions, actions => \@results &>
@@ -40,67 +41,37 @@
<input type="hidden" name="id" value="<%$Ticket->id%>">
<input type="hidden" name="<%$Ticket->Id%>-MergeInto">
-<& /RTIR/Elements/Listing,
- Type => $Type, Queue => $Ticket->QueueObj->Name, check => 'radio', %ARGS &>
+<& /RTIR/Search/Elements/ShowResults,
+ check => 'radio',
+ CheckName => 'SelectedTicket',
+ Queue => $Queue,
+ QueryString => $QueryString,
+ BaseURL => $RT::WebPath."/RTIR/Merge.html?id=$id&",
+ %ARGS &>
<HR>
<& /Elements/Submit, Caption=> loc('Merge into selected Ticket'), Label => loc("Merge") &>
</form>
-<& /RTIR/Elements/SearchFields, Path => '/RTIR/Merge.html',
- Queue => $Ticket->QueueObj->Name, %ARGS &>
-
<%INIT>
my $Ticket = LoadTicket($id);
+my $Queue = $Ticket->QueueObj->Name;
-my ($Type, undef) = $m->comp('Elements/Type', Ticket => $Ticket->Id);
+my $mergetabs = { } ;
-my @states;
-my $name = $Type;
-if ($Type eq "Incident") {
- @states = ('open');
-} elsif ($Type eq "Report") {
- @states = ('new', 'open');
- $name = 'Incident Report';
-} elsif ($Type eq "Investigation") {
- @states = ('open');
-} elsif ($Type eq "Block") {
- @states = ('pending activation', 'active', 'pending removal');
-}
+$mergetabs->{'_a'} = {
+ class => "nav",
+ path => "RTIR/Search/MergeRefine.html?Queue=" . $Ticket->QueueObj->Name . "&id=$id",
+ title => loc('Refine') };
+
+my ($Type, @states) = $m->comp('Elements/Type', Ticket => $Ticket->Id);
if (! $session{'tickets'}) {
# Init a new search
$session{'tickets'} = RT::Tickets->new( $session{'CurrentUser'} );
}
-my $ticketcount;
-$session{'i'}++;
-if ($session{'tickets'}) {
- if ($ARGS{'DeleteRestriction'}) {
- $session{'tickets'}->DeleteRestriction($ARGS{'DeleteRestriction'});
- }
- if ( ($ARGS{'ClearRestrictions'}) || ($ARGS{'NewSearch'}) ) {
- $session{'tickets'}->ClearRestrictions;
- $session{'tickets'}->LimitQueue(VALUE => $Ticket->QueueObj->Name);
-
- # we can't merge with ourself
- $session{'tickets'}->LimitId(VALUE => $Ticket->Id, OPERATOR => '!=');
-
- my $cf = RT::CustomField->new($session{'CurrentUser'});
- $cf->LoadByNameAndQueue(Queue => 'Incidents', Name => '_RTIR_State');
- foreach my $state (@states) {
- $session{'tickets'}->LimitCustomField(CUSTOMFIELD => $cf->Id, VALUE => $state);
- }
- }
-}
-
-ProcessSearchQuery(ARGS=>\%ARGS);
-$session{'tickets'}->RedoSearch();
-if ( $session{'tickets'}->DescribeRestrictions()) {
- $ticketcount = $session{tickets}->Count();
-}
-
# Iterate through the ARGS hash and remove anything with a null value.
map ($ARGS{$_} =~ /^$/ && (delete $ARGS{$_}), keys %ARGS);
@@ -117,9 +88,38 @@
}
}
-my $Title = loc("Merge [_1] #[_2]: [_3]", $name, $id, $Ticket->Subject);
+my $Title = loc("Merge [_1] #[_2]: [_3]", $Type, $id, $Ticket->Subject);
+
+if (!$Query) {
+ $Query = $m->comp('/RTIR/Elements/NewQuery', Queue => $Queue);
+}
+
+my $QueryString = "&".$m->comp('/Elements/QueryString',
+ Query => $Query,
+ Format => $Format,
+ Rows => $Rows,
+ OrderBy => $OrderBy,
+ Order => $Order,
+ Page => $Page);
+
+if (!$BaseQuery) {
+ $BaseQuery = $m->comp('/RTIR/Elements/BaseQuery', Queue => $Queue);
+ $BaseQuery .= " AND id != $id"
+}
+
+$Query = "$BaseQuery AND ( $Query )";
+$ARGS{'Query'} = $Query;
+
</%INIT>
<%ARGS>
+$BaseQuery => undef
+$Query => undef
+$Format => undef
+$HideResults => 0
+$Rows => 50
+$Page => 1
+$OrderBy => 'id'
+$Order => 'ASC'
$id => undef
</%ARGS>
Modified: rtir/branches/1.1/html/RTIR/Search/Elements/BuildQuery
==============================================================================
--- rtir/branches/1.1/html/RTIR/Search/Elements/BuildQuery (original)
+++ rtir/branches/1.1/html/RTIR/Search/Elements/BuildQuery Fri Aug 27 04:16:23 2004
@@ -44,12 +44,13 @@
%#
%# }}} END BPS TAGGED BLOCK
-<FORM METHOD="POST" ACTION="Build.html" NAME="BuildQuery">
+<FORM METHOD="POST" ACTION=<%$FormAction%> NAME="BuildQuery">
<input type=hidden name=SearchId value="<%$SearchId%>">
<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'}%>">
<table width=100%>
<tr>
<td valign=top class="boxcontainer">
@@ -113,4 +114,5 @@
$dirty => undef
$AvailableColumns => undef
$CurrentFormat => undef
+$FormAction => "Build.html"
</%ARGS>
Modified: rtir/branches/1.1/html/RTIR/Search/Elements/ProcessQuery
==============================================================================
--- rtir/branches/1.1/html/RTIR/Search/Elements/ProcessQuery (original)
+++ rtir/branches/1.1/html/RTIR/Search/Elements/ProcessQuery Fri Aug 27 04:16:23 2004
@@ -659,7 +659,7 @@
# {{{ Show the results, if we were asked.
if ( $ARGS{"DoSearch"} ) {
- $m->comp($ResultPage , Query => $Query, Format => $Format, Order => $Order, OrderBy => $OrderBy, Rows => $RowsPerPage, BaseQuery => $BaseQuery, Queue => $ARGS{'Queue'});
+ $m->comp($ResultPage, Query => $Query, Format => $Format, Order => $Order, OrderBy => $OrderBy, Rows => $RowsPerPage, BaseQuery => $BaseQuery, Queue => $ARGS{'Queue'}, id => $ARGS{'id'});
$m->abort();
}
# }}}
Modified: rtir/branches/1.1/html/RTIR/Search/Elements/ShowResults
==============================================================================
--- rtir/branches/1.1/html/RTIR/Search/Elements/ShowResults (original)
+++ rtir/branches/1.1/html/RTIR/Search/Elements/ShowResults Fri Aug 27 04:16:23 2004
@@ -1,4 +1,4 @@
-<& /Elements/TicketList,
+<& /RTIR/Elements/TicketList,
Query => $Query,
AllowSorting => 1,
OrderBy => $OrderBy,
@@ -6,16 +6,18 @@
Rows => $Rows,
Page => $Page,
Format => $Format,
- BaseURL => $RT::WebPath."/Search/Results.html?"
-
+ BaseURL => $BaseURL,
+ check => $ARGS{'check'},
+ CheckName => $ARGS{'CheckName'},
&>
+
<div align=right>
% if ($Queue eq 'Incident Reports') {
%# this would do well as a Callback
<a href="<%$RT::WebPath%>/RTIR/Report/BulkReject.html?Queue=<%$Queue%><%$QueryString%>"><&|/l&>Bulk Reject</&></a><br>
% }
-<a href="<%$RT::WebPath%>/RTIR/Search/Results.html?Queue=<%$Queue%><%$QueryString%>"><&|/l&>Bookmarkable link</&></a><br>
+<a href="<%$BaseURL%>Queue=<%$Queue%><%$QueryString%>"><&|/l&>Bookmarkable link</&></a><br>
<a href="<%$RT::WebPath%>/Search/Results.tsv?Queue=<%$Queue%><%$QueryString%>"><&|/l&>spreadsheet</&></a> |
<a href="<%$RT::WebPath%>/Search/Results.rdf?Queue=<%$Queue%><%$QueryString%>"><&|/l&>RSS</&></a> |
</div>
@@ -30,4 +32,5 @@
$Order => 'ASC'
$QueryString => undef
$Queue => undef
+$BaseURL => $RT::WebPath."/Search/Results.html?"
</%ARGS>
More information about the Rt-commit
mailing list