[Rt-commit] r4918 - in rtir/branches/1.9-EXPERIMENTAL: html/RTIR/Incident

[ruz at bestpractical.com]

Author: ruz
Date: Thu Mar 30 19:25:51 2006
New Revision: 4918

Modified:
   rtir/branches/1.9-EXPERIMENTAL/   (props changed)
   rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Reply.html

Log:
 r1196 at cubic-pc:  cubic | 2006-03-31 02:04:26 +0400
 * add blocks correspondents to reply to all/resolve/abandon incident's pages


Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Reply.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Reply.html	(original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Reply.html	Thu Mar 30 19:25:51 2006
@@ -69,6 +69,18 @@
     OrderBy   => $OrderBy,
     Order     => $Order,
 &>
+<h2><&|/l&>Blocks Correspondents</&></h2>
+<& /RTIR/Search/Elements/ShowResults,
+    Queue     => 'Investigations',
+    BaseURL   => $current_tab,
+    BaseQuery => $BaseQuery || $BlockBaseQuery,
+    Query     => $Query,
+    Format    => '__RTIR_Check__,'. $Format,
+    Rows      => $Rows,
+    Page      => $Page,
+    OrderBy   => $OrderBy,
+    Order     => $Order,
+&>
 % }
 
 <& Elements/ReplyForm, AllowResponse => ($ARGS{Status} !~ /^(?:resolved|rejected)$/) &>
@@ -126,7 +138,7 @@
         my $oldstate = RT::IR::Ticket::FirstCustomFieldValue( $Ticket, '_RTIR_State' );
 
         my @tempresults;
-        $ARGS{'UpdateAttachments'} = delete $session{'Attachments'} if $session{'Attachments'};
+        $ARGS{'UpdateAttachments'} = delete $session{'Attachments'};
         push @tempresults, ProcessUpdateMessage( TicketObj => $Ticket, ARGSRef => \%ARGS );
 
         unless ( RT::IR::Ticket::IsLinkedToActiveIncidents( $Ticket, $IncidentObj ) ) {
@@ -144,16 +156,17 @@
 
     #XXX: shouldn't we record message into incident?
     push @results, ProcessTicketBasics( TicketObj => $IncidentObj, ARGSRef => \%ARGS );
-    $m->comp("Display.html", results => \@results, id => $id);
-    $m->abort;
+    return $m->comp("Display.html", results => \@results, id => $id);
 }
 
-my ($InvBaseQuery, $IRBaseQuery );
+my ($InvBaseQuery, $IRBaseQuery, $BlockBaseQuery);
 unless ( $BaseQuery ) {
     $InvBaseQuery = join ' AND ', map "( $_ )", grep $_,
         $m->comp('/RTIR/Elements/BaseQuery', Queue => 'Investigations'), "MemberOf = $id";
     $IRBaseQuery = join ' AND ', map "( $_ )", grep $_,
         $m->comp('/RTIR/Elements/BaseQuery', Queue => 'Incident Reports'), "MemberOf = $id";
+    $BlockBaseQuery = join ' AND ', map "( $_ )", grep $_,
+        $m->comp('/RTIR/Elements/BaseQuery', Queue => 'Blocks'), "MemberOf = $id";
 }
 
 my $current_tab = "RTIR/Incident/Reply.html?".