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

leira at pallas.eruditorum.org leira at pallas.eruditorum.org
Mon Sep 6 22:27:56 EDT 2004


Author: leira
Date: Mon Sep  6 22:27:56 2004
New Revision: 1425

Added:
   rtir/branches/1.1/html/RTIR/Incident/LinkChildren.html
Removed:
   rtir/branches/1.1/html/RTIR/Incident/Elements/BlockTabs
   rtir/branches/1.1/html/RTIR/Incident/Elements/InvestigationTabs
   rtir/branches/1.1/html/RTIR/Incident/Elements/ReportTabs
   rtir/branches/1.1/html/RTIR/Incident/LinkBlocks.html
   rtir/branches/1.1/html/RTIR/Incident/LinkInvestigations.html
   rtir/branches/1.1/html/RTIR/Incident/LinkReports.html
Modified:
   rtir/branches/1.1/html/RTIR/Create.html
   rtir/branches/1.1/html/RTIR/Elements/ChildSummary
   rtir/branches/1.1/html/RTIR/Elements/QueueTabs
   rtir/branches/1.1/html/RTIR/Elements/ShowIncidents
   rtir/branches/1.1/html/RTIR/Incident/BulkReply.html
   rtir/branches/1.1/html/RTIR/Incident/Display.html
   rtir/branches/1.1/html/RTIR/Incident/Elements/BulkLink
   rtir/branches/1.1/html/RTIR/Incident/Elements/Tabs
   rtir/branches/1.1/html/RTIR/Incident/LinkToIncident.html
   rtir/branches/1.1/html/RTIR/Incident/Reply.html
   rtir/branches/1.1/html/RTIR/Incident/ShowBlocks.html
   rtir/branches/1.1/html/RTIR/Incident/ShowInvestigations.html
   rtir/branches/1.1/html/RTIR/Incident/ShowReports.html
Log:
Consolidate LinkReports/Investigations/Blocks into LinkChildren.

Consolidate Report/Investigation/BlockTabs into LinkTabs.

Incident Bulk Reply uses new-style search results.


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	Mon Sep  6 22:27:56 2004
@@ -30,7 +30,8 @@
     current_subtab => "RTIR/Split.html?Ticket=".$TicketObj->Id, 
     Title => $Title &>
 % } elsif ($Incident) {
-<& "/RTIR/Incident/Elements/".$Type."Tabs", 
+<& "/RTIR/Incident/Elements/LinkTabs", 
+    Queue => $Queue,
     Ticket => $IncidentObj,
     current_tab => "RTIR/Create.html?Incident=".$Incident."&Queue=".$Queue, 
     current_subtab => "RTIR/Create.html?Incident=".$Incident."&Queue=".$Queue, 

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 22:27:56 2004
@@ -60,16 +60,8 @@
 <td colspan=5>
 [<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') {
-%     $linkfile="LinkReports.html";
-%   } elsif ($Queue eq 'Investigations') {
-%     $linkfile="LinkInvestigations.html";
-%   } elsif ($Queue eq 'Blocks') {
-%     $linkfile="LinkBlocks.html";
-%   }
-% if ($linkfile) {
-[<a href="<%$RT::WebPath%>/RTIR/Incident/<%$linkfile%>?ClearRestrictions=1&AttachmentField=Content&AttachmentFieldOp=LIKE&ValueOfAttachmentField=<%$q%>&id=<%$ticket%>"><%loc("Bulk Link")%></a>]
+% 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>]
 % }
 %   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/Elements/QueueTabs
==============================================================================
--- rtir/branches/1.1/html/RTIR/Elements/QueueTabs	(original)
+++ rtir/branches/1.1/html/RTIR/Elements/QueueTabs	Mon Sep  6 22:27:56 2004
@@ -87,18 +87,6 @@
 		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->{'_E'} = { title => loc('Edit'),
@@ -111,6 +99,11 @@
             path  => "RTIR/Merge.html?id=$id$QueryString",
 	    separator => 1  };
 
+    foreach my $key (keys %$appendtabs) {
+	$ticket_page_tabs->{$key}->{'title'} = $appendtabs->{$key}->{'title'};
+	$ticket_page_tabs->{$key}->{'path'} = $appendtabs->{$key}->{'path'};
+    }
+
 }
 
 foreach my $tab ( sort keys %{$ticket_page_tabs} ) {
@@ -225,13 +218,14 @@
 	$tabs->{'h'}->{"subtabs"}        = $subtabs;
     }
 
-} elsif ($Type eq 'Incident' && $ChildObj) {
-    my $childq = $ChildObj->QueueObj->Name;
+} elsif ($Type eq 'Incident' && $Ticket &&
+	$Ticket->QueueObj->Name ne 'Incidents') {
+    my $childq = $Ticket->QueueObj->Name;
     next if $childq eq 'Incidents';
     my ($childtype, undef) = $m->comp('/RTIR/Elements/Type', Queue => $childq);
     
-    $tabs->{'h'} = { title => loc('Link [_1] #[_2]', $childtype, $ChildObj->Id),
-				  path  => "RTIR/Incident/LinkToIncident.html?id=" . $ChildObj->Id,
+    $tabs->{'h'} = { title => loc('Link [_1] #[_2]', $childtype, $Ticket->Id),
+				  path  => "RTIR/Incident/LinkToIncident.html?id=" . $Ticket->Id,
 				  separator => 1 };
 
     if ( $tabs->{'h'}->{'path'} eq $current_tab ) {
@@ -243,9 +237,9 @@
 
   
 <%ARGS>
-$ChildObj => undef
 $Ticket => undef
 $subtabs => undef
+$appendtabs => undef
 $current_tab => undef
 $current_subtab => undef
 $Title => undef

Modified: rtir/branches/1.1/html/RTIR/Elements/ShowIncidents
==============================================================================
--- rtir/branches/1.1/html/RTIR/Elements/ShowIncidents	(original)
+++ rtir/branches/1.1/html/RTIR/Elements/ShowIncidents	Mon Sep  6 22:27:56 2004
@@ -39,10 +39,8 @@
 
 % if ($depth == 1) {
 %   if ($Ticket->Owner == $session{'CurrentUser'}->id) {
-<a href="<%$RT::WebPath%>/RTIR/Incident/LinkToIncident.html?id=<%$Ticket->Id%>&ClearRestrictions=1">
-<b>[Link]</b></a>
-<a href="<%$RT::WebPath%>/RTIR/Create.html?child=<%$Ticket->Id%>&Queue=Incidents">
-<b>[New]</b></a> 
+<b><a href="<%$RT::WebPath%>/RTIR/Incident/LinkToIncident.html?id=<%$Ticket->Id%>&ClearRestrictions=1">[Link]</a></b>
+<b><a href="<%$RT::WebPath%>/RTIR/Create.html?child=<%$Ticket->Id%>&Queue=Incidents">[New]</a></b>
 %   }
 % }
 

Modified: rtir/branches/1.1/html/RTIR/Incident/BulkReply.html
==============================================================================
--- rtir/branches/1.1/html/RTIR/Incident/BulkReply.html	(original)
+++ rtir/branches/1.1/html/RTIR/Incident/BulkReply.html	Mon Sep  6 22:27:56 2004
@@ -68,9 +68,11 @@
 $ARGS{UpdateTimeWorked}%>"> <&|/l&>minutes</&>
 </td></tr>
 <tr><td align=right><&|/l&>Update Type</&>:</td>
+Status: <%$ARGS{'Status'}%><br>
+i: <% $i %><br>
 <td><select name="UpdateType">
   <option value="private" <%$CommentDefault%>><&|/l&>Comments (Not sent to requestors)</&></option>
-% if ($ARGS{Status} ne 'resolved' && $ARGS{Status} ne 'rejected' && $i == 0) {
+% if ($ARGS{Status} ne 'resolved' && $ARGS{Status} ne 'rejected' && $i != 0) {
    <option value="response" <%$ResponseDefault%>><&|/l&>Response to requestors</&></option>
 % }
 </select> 

Modified: rtir/branches/1.1/html/RTIR/Incident/Display.html
==============================================================================
--- rtir/branches/1.1/html/RTIR/Incident/Display.html	(original)
+++ rtir/branches/1.1/html/RTIR/Incident/Display.html	Mon Sep  6 22:27:56 2004
@@ -118,7 +118,7 @@
     <table width=100%>
     <td align="right">
 		<font size="-1">| <a href="<%$RT::WebPath%>/RTIR/Create.html?Incident=<%$Ticket->Id%>&Queue=Incident Reports">New</a> 
-		<font size="-1">| <a href="<%$RT::WebPath%>/RTIR/Incident/LinkReports.html?ClearRestrictions=1&id=<%$Ticket->Id%>"><%loc("Link")%></a> |
+		<font size="-1">| <a href="<%$RT::WebPath%>/RTIR/Incident/LinkChildren.html?ClearRestrictions=1&id=<%$Ticket->Id%>&Queue=Incident Reports"><%loc("Link")%></a> |
     </td></table>
 % }
 
@@ -142,7 +142,7 @@
 
 		<table width=100%><td align="right">
 		<font size="-1">| <a href="<%$RT::WebPath%>/RTIR/Create.html?Incident=<%$Ticket->Id%>&Queue=Investigations">Launch</a> 
-		<font size="-1">| <a href="<%$RT::WebPath%>/RTIR/Incident/LinkInvestigations.html?ClearRestrictions=1&id=<%$Ticket->Id%>"><%loc("Link")%></a> |
+		<font size="-1">| <a href="<%$RT::WebPath%>/RTIR/Incident/LinkChildren.html?ClearRestrictions=1&id=<%$Ticket->Id%>&Queue=Investigations%>"><%loc("Link")%></a> |
 		</td></table>
 % }
 
@@ -164,7 +164,7 @@
 % if ($Ticket->CurrentUserHasRight('ModifyTicket')) {
 		<table width=100%><td align="right">
 		<font size="-1">| <a href="<%$RT::WebPath%>/RTIR/Create.html?Incident=<%$Ticket->Id%>&Queue=Blocks">New</a> 
-		<font size="-1">| <a href="<%$RT::WebPath%>/RTIR/Incident/LinkBlocks.html?ClearRestrictions=1&id=<%$Ticket->Id%>"><%loc("Link")%></a> |
+		<font size="-1">| <a href="<%$RT::WebPath%>/RTIR/Incident/LinkChildren.html?ClearRestrictions=1&id=<%$Ticket->Id%>&Queue=Blocks>"><%loc("Link")%></a> |
 		</td></table>
 % }
 
@@ -302,11 +302,9 @@
       push(@Actions, $msg);
     }
   } elsif ($ARGS{'BulkLink'}) {
-$m->print("bulk linking!<br>");
     #Iterate through each ticket we've been handed
     my $IncidentObj = LoadTicket($id);
     while (my $t = $session{'tickets'}->Next) {
-$m->print("ticket: " . $t->Id . "<br>");
       next unless ($ARGS{"UpdateTicket".$t->Id});
       &$DoLinks($t, $IncidentObj);
     }

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 22:27:56 2004
@@ -28,9 +28,9 @@
 
 <& /RTIR/Search/Elements/ShowResults, 
     Queue => $Queue,
+    Query => $Query,
     QueryString => $QueryString, 
     BaseURL => $BaseURL,
-    Format => $Format,
     %ARGS &>
 
 <& /Elements/Submit, Name => "SubmitTicket", Caption => $SubmitCaption, Label => loc("Link") &>
@@ -42,13 +42,9 @@
 my $TicketObj = new RT::Ticket($session{'CurrentUser'});
 $TicketObj->Load($id);
 
-my $Queue = $TicketObj->QueueObj->Name;
 my ($Type, @states) = $m->comp('/RTIR/Elements/Type', Ticket => $id);
 
-my ($LinkType, @linkstates) = $m->comp('/RTIR/Elements/Type', Queue => $LinkQ);
-
-my $QueueObj = new RT::Queue($session{'CurrentUser'});
-$QueueObj->Load($Queue) || Abort(loc("Queue could not be loaded."));
+my ($LinkType, @linkstates) = $m->comp('/RTIR/Elements/Type', Queue => $Queue);
 
 my ($title, $ticketcount);
 $session{'i'}++;
@@ -72,7 +68,7 @@
 }
 
 if (!$Query) {
-    $Query = $m->comp('/RTIR/Elements/NewQuery', Queue => $LinkQ);
+    $Query = $m->comp('/RTIR/Elements/NewQuery', Queue => $Queue);
 }
 
 my $QueryString = "&".$m->comp('/Elements/QueryString',
@@ -84,7 +80,7 @@
                                Page => $Page);
 
 if (!$BaseQuery) {
-    $BaseQuery = $m->comp('/RTIR/Elements/BaseQuery', Queue => $LinkQ);
+    $BaseQuery = $m->comp('/RTIR/Elements/BaseQuery', Queue => $Queue);
 }
 
 $Query = "$BaseQuery AND ( $Query )";
@@ -94,9 +90,9 @@
 
 <%ARGS>
 $id => undef
-$LinkQ => undef
 $SubmitCaption => loc("Link Tickets")
-$BaseURL => "/RTIR/Incident/LinkReports.html"
+$Queue => undef
+$BaseURL => "/RTIR/Incident/LinkChildren.html?id=$id&Queue=$Queue"
 $BaseQuery => undef
 $Query => undef
 $Format => undef 

Modified: rtir/branches/1.1/html/RTIR/Incident/Elements/Tabs
==============================================================================
--- rtir/branches/1.1/html/RTIR/Incident/Elements/Tabs	(original)
+++ rtir/branches/1.1/html/RTIR/Incident/Elements/Tabs	Mon Sep  6 22:27:56 2004
@@ -24,6 +24,12 @@
 %# END LICENSE BLOCK
 <& /RTIR/Elements/QueueTabs, 
     QueueName => 'Incidents',
+    current_tab => $current_tab,
+    current_subtab => $current_subtab,
     %ARGS
 &> 
 
+<%ARGS>
+$current_tab => undef
+$current_subtab => undef
+</%ARGS>

Added: rtir/branches/1.1/html/RTIR/Incident/LinkChildren.html
==============================================================================
--- (empty file)
+++ rtir/branches/1.1/html/RTIR/Incident/LinkChildren.html	Mon Sep  6 22:27:56 2004
@@ -0,0 +1,55 @@
+%# BEGIN LICENSE BLOCK
+%# 
+%# Copyright (c) 1996-2002 Jesse Vincent <jesse at bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org
+%# 
+%# This work is distributed in the hope that it will be useful, but
+%# WITHOUT ANY WARRANTY; without even the implied warranty of
+%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+%# General Public License for more details.
+%# 
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+<& /RTIR/Elements/Header, 
+    Title => $title, 
+    Refresh => $session{'tickets_refresh_interval'} &>
+
+<& Elements/LinkTabs, 
+    Queue => $Queue,
+    Ticket => $IncidentObj, 
+    current_subtab => 'RTIR/Incident/LinkChildren.html?ClearRestrictions=1&id='.$IncidentObj->id.'&Queue='.$Queue,
+    Tab => loc('Link [_1]', $Queue);
+    Title => $title,
+ &>
+
+<& Elements/BulkLink,
+    SubmitCaption => $SubmitCaption, 
+    id => $id,
+    Status => 'open',
+    BaseURL => "/RTIR/Incident/LinkChildren.html",
+    Queue => $Queue,
+    %ARGS &>
+
+<%INIT>
+my $IncidentObj = LoadTicket($id);
+my $title = loc("Link selected [_1] to Incident #[_2]", $Queue, $IncidentObj->Id);
+my $SubmitCaption = loc("Link selected with Incident #[_1]", $IncidentObj->id);
+
+</%INIT>
+
+<%ARGS>
+$id => undef
+$Queue => undef
+</%ARGS>

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	Mon Sep  6 22:27:56 2004
@@ -29,7 +29,7 @@
 <& '/RTIR/Search/Elements/RefineTabs',
    path => "RTIR/Search/LinkRefine.html?Queue=Incidents&id=$id$QueryString",
    current_tab => "RTIR/Incident/LinkToIncident.html?id=$id",
-   ChildObj => $ChildObj, 
+   Ticket => $ChildObj, 
    Queue => 'Incidents',
    Title => $title,
    Format => $Format,

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	Mon Sep  6 22:27:56 2004
@@ -23,10 +23,12 @@
 %# 
 %# END LICENSE BLOCK
 <& /RTIR/Elements/Header, Title => $title, Refresh => $session{'tickets_refresh_interval'} &>
-<& Elements/ReportTabs, 
+<& Elements/LinkTabs, 
+    Queue => 'Incident Reports',
     Ticket => $IncidentObj, 
     current_tab => 'RTIR/Incident/ShowReports.html?id='.$IncidentObj->id,
     current_subtab => 'RTIR/Incident/ReplyToReporters.html',
+    Tab => 'Bulk Reply',
     Title => $title &>
 
 <form action="BulkReply.html" method=get>
@@ -34,6 +36,26 @@
 <input type=hidden name=IncidentObj value=<%$IncidentObj%>>
 <input type=hidden name=Status value=<%$ARGS{'DefaultStatus'}%>>
 <input type=hidden name=All value=<%$ARGS{'All'}%>>
+
+<h2>Reporters</h2>
+<& /RTIR/Search/Elements/ShowResults, 
+    BaseQuery => $BaseQuery,
+    Query => "($Query) AND Queue = 'Incident Reports'",
+    QueryString => $QueryString, 
+    BaseURL => $BaseURL,
+    Format => $Format,
+    &>
+
+<h2>Investigation Correspondents</h2>
+<& /RTIR/Search/Elements/ShowResults, 
+    BaseQuery => $BaseQuery,
+    Query => "($Query) AND Queue = 'Investigations'",
+    QueryString => $QueryString, 
+    BaseURL => $BaseURL,
+    Format => $Format,
+    &>
+
+
 %if ($ticketcount && !  $ARGS{'HideResults'}) {
 <TABLE WIDTH=100% border=0 cellpadding=2 CELLSPACING=0>
 <& /RTIR/Elements/TicketHeader, check => "check", Type => 'Report', %ARGS &>
@@ -59,7 +81,7 @@
 %while (my $Ticket = $session{'tickets'}->Next) {
 % next if ($Ticket->FirstCustomFieldValue('_RTIR_State') eq 'resolved' ||
 %	   $Ticket->FirstCustomFieldValue('_RTIR_State') eq 'rejected');
-% next unless ($Ticket->QueueObj->Name eq 'Investigations');
+% next unless ($Ticket->QueueObj->Name eq 'Investigation');
 % $i++;
 <& /RTIR/Elements/TicketRow, Type => 'Report', Ticket => $Ticket, i=> $i, check => "check", %ARGS &>
 % }
@@ -99,50 +121,36 @@
 </form>
 
 <%INIT>
-
+$Format = $RT::RTIRBulkReplyResultFormat;
 my $IncidentObj = LoadTicket($id);
 
 my ($title, $ticketcount, $found);
 my $QueueObj = new RT::Queue($session{'CurrentUser'});
 $QueueObj->Load("Incident Reports") || Abort(loc("Queue could not be loaded."));
 
-my $MyReports;
-$MyReports = new RT::Tickets ($session{'CurrentUser'});
-$MyReports->LimitQueue(VALUE => 'Incident Reports');
-my $cf = RT::CustomField->new($session{'CurrentUser'});
-$cf->LoadByNameAndQueue(Queue => $QueueObj->Id, Name => '_RTIR_State');
-$MyReports->LimitCustomField(CUSTOMFIELD => $cf->Id, VALUE => 'open');
-
 if (! $session{'tickets'}) {
     # Init a new search
     $session{'tickets'} = RT::Tickets->new( $session{'CurrentUser'} );
 }
 
-$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 => "Incident Reports");
-
-      if ($All) {
-        $session{'tickets'}->LimitQueue(VALUE => "Investigations");
-      }
-    $session{'tickets'}->LimitMemberOf($id);
-    }	
+if (!$Query) {
+    $Query = "('CF.Incident Reports.{_RTIR_State}' = 'open' OR 'CF.Investigations.{_RTIR_State}' = 'open') AND MemberOf = $id";
+}
+
+my $QueryString = "&".$m->comp('/Elements/QueryString',
+                               Query => $Query,
+                               Format => $Format,
+                               Rows => $Rows,
+                               OrderBy => $OrderBy,
+                               Order => $Order,
+                               Page => $Page);
+
+if (!$BaseQuery) {
+    $BaseQuery = "Queue = 'Incident Reports'";
+    $BaseQuery = "($BaseQuery OR Queue = 'Investigations')" if $All;
 }
-   ProcessSearchQuery(ARGS=>\%ARGS);
-   $session{'tickets'}->RedoSearch();
 
-   if ( $session{'tickets'}->DescribeRestrictions()) {
-       $ticketcount = $session{tickets}->Count();
-        $found = loc('Found [quant,_1,incident]', $ticketcount);
-    } else {
-        $found = loc("Find incidents");
-   }
+$Query = "$BaseQuery AND ( $Query )";
 
 my ($SubmitCaption, $SubmitLabel);
 if ($ARGS{'DefaultStatus'} eq 'resolved') {
@@ -171,4 +179,13 @@
 <%ARGS>
 $id => undef
 $All => 0
+$BaseURL => "/RTIR/Incident/Reply.html?DefaultStatus=stalled&id=$id"
+$BaseQuery => undef
+$Query => undef
+$Format => undef 
+$HideResults => 0
+$Rows => 50
+$Page => 1
+$OrderBy => 'id'
+$Order => 'ASC'
 </%ARGS>

Modified: rtir/branches/1.1/html/RTIR/Incident/ShowBlocks.html
==============================================================================
--- rtir/branches/1.1/html/RTIR/Incident/ShowBlocks.html	(original)
+++ rtir/branches/1.1/html/RTIR/Incident/ShowBlocks.html	Mon Sep  6 22:27:56 2004
@@ -23,7 +23,8 @@
 %# 
 %# END LICENSE BLOCK
 <& /RTIR/Elements/Header, Title => $Title &>
-<& /RTIR/Incident/Elements/BlockTabs, 
+<& /RTIR/Incident/Elements/LinkTabs, 
+    Queue => 'Blocks',
     Ticket => $Incident, 
     current_tab => 'RTIR/Incident/ShowBlocks.html?id='.$Incident->id,
     Title => $Title &>

Modified: rtir/branches/1.1/html/RTIR/Incident/ShowInvestigations.html
==============================================================================
--- rtir/branches/1.1/html/RTIR/Incident/ShowInvestigations.html	(original)
+++ rtir/branches/1.1/html/RTIR/Incident/ShowInvestigations.html	Mon Sep  6 22:27:56 2004
@@ -23,7 +23,8 @@
 %# 
 %# END LICENSE BLOCK
 <& /RTIR/Elements/Header, Title => $Title &>
-<& /RTIR/Incident/Elements/InvestigationTabs, 
+<& /RTIR/Incident/Elements/LinkTabs, 
+    Queue => 'Investigations',
     Ticket => $Incident, 
     current_tab => 'RTIR/Incident/ShowInvestigations.html?id='.$Incident->id,
     Title => $Title &>

Modified: rtir/branches/1.1/html/RTIR/Incident/ShowReports.html
==============================================================================
--- rtir/branches/1.1/html/RTIR/Incident/ShowReports.html	(original)
+++ rtir/branches/1.1/html/RTIR/Incident/ShowReports.html	Mon Sep  6 22:27:56 2004
@@ -23,7 +23,8 @@
 %# 
 %# END LICENSE BLOCK
 <& /RTIR/Elements/Header, Title => $Title &>
-<& /RTIR/Incident/Elements/ReportTabs, 
+<& /RTIR/Incident/Elements/LinkTabs, 
+    Queue => 'Incident Reports',
     Ticket => $Incident, 
     current_tab => 'RTIR/Incident/ShowReports.html?id='.$Incident->id,
     Title => $Title &>


More information about the Rt-commit mailing list