[Rt-commit] r17077 - in rtir/2.4/trunk/html/RTIR: Incident

[ruz at bestpractical.com]

Author: ruz
Date: Wed Dec  3 00:29:14 2008
New Revision: 17077

Modified:
   rtir/2.4/trunk/html/RTIR/Create.html
   rtir/2.4/trunk/html/RTIR/Incident/Display.html
   rtir/2.4/trunk/html/RTIR/Incident/Edit.html
   rtir/2.4/trunk/html/RTIR/Incident/Reply.html

Log:
* drop @results argument from Display.html, it's used by
  new ListActions in RT 3.8, however in several places we
  can not use redirect

Modified: rtir/2.4/trunk/html/RTIR/Create.html
==============================================================================
--- rtir/2.4/trunk/html/RTIR/Create.html	(original)
+++ rtir/2.4/trunk/html/RTIR/Create.html	Wed Dec  3 00:29:14 2008
@@ -443,7 +443,8 @@
     unless ( $checks_failure ) {
         $ARGS{'new-MemberOf'} = $parentvalue if $parentvalue;
         $m->callback(CallbackName => 'BeforeDisplay', Ticket => $TicketObj, ARGSRef => \%ARGS);
-        return $m->comp( 'Display.html', %ARGS, SkipNotification => \@SkipNotification, results => \@results );
+        push @{ $session{'Actions'}{''} ||= [] }, @results;
+        return $m->comp( 'Display.html', %ARGS, SkipNotification => \@SkipNotification );
     }
     unshift @results, loc("Creation failed:") if @results;
 }

Modified: rtir/2.4/trunk/html/RTIR/Incident/Display.html
==============================================================================
--- rtir/2.4/trunk/html/RTIR/Incident/Display.html	(original)
+++ rtir/2.4/trunk/html/RTIR/Incident/Display.html	Wed Dec  3 00:29:14 2008
@@ -258,6 +258,8 @@
     return map { loc("Ticket [_1]: [_2]", $child->Id, $_) } @results;
 };
 
+my @results;
+
 my $TicketObj;
 my $new_ticket = 0;
 if ( $id eq 'new' ) {
@@ -359,7 +361,6 @@
 </%INIT>
 
 <%ARGS>
- at results => ()
 $id => undef
 $Queue => 'Incidents'
 $Child => undef

Modified: rtir/2.4/trunk/html/RTIR/Incident/Edit.html
==============================================================================
--- rtir/2.4/trunk/html/RTIR/Incident/Edit.html	(original)
+++ rtir/2.4/trunk/html/RTIR/Incident/Edit.html	Wed Dec  3 00:29:14 2008
@@ -220,7 +220,9 @@
     if ( !$checks_failure && RT->Config->Get('DisplayAfterEdit', $session{'CurrentUser'}) ) {
         $m->callback(CallbackName => 'BeforeDisplay', ARGSRef => \%ARGS, Ticket => $Ticket);
 
-        return $m->comp("/RTIR/Incident/Display.html", %ARGS, results => [@results], id => $id );
+        push @{ $session{'Actions'}{''} ||= [] }, @results;
+
+        return $m->comp("/RTIR/Incident/Display.html", %ARGS, id => $id );
     }
 }
 

Modified: rtir/2.4/trunk/html/RTIR/Incident/Reply.html
==============================================================================
--- rtir/2.4/trunk/html/RTIR/Incident/Reply.html	(original)
+++ rtir/2.4/trunk/html/RTIR/Incident/Reply.html	Wed Dec  3 00:29:14 2008
@@ -244,8 +244,9 @@
         PassArguments => $pass,
         Ticket => $IncidentObj
     );
+    push @{ $session{'Actions'}{''} ||= [] }, @results;
     # NOTE: don't pass %ARGS further as we've done everything we need here
-    return $m->comp("Display.html", %$pass, results => \@results, id => $id);
+    return $m->comp("Display.html", %$pass, id => $id);
 }
 
 # XXX, BLOODY-DIRTY-EVIL HACK: when we load the page first time we should