[Rt-commit] r9594 - in rt/branches/3.7-EXPERIMENTAL: . html/SelfService html/Ticket

[ruz at bestpractical.com]

Author: ruz
Date: Tue Nov  6 07:10:17 2007
New Revision: 9594

Modified:
   rt/branches/3.7-EXPERIMENTAL/   (props changed)
   rt/branches/3.7-EXPERIMENTAL/html/Elements/ListActions
   rt/branches/3.7-EXPERIMENTAL/html/SelfService/Display.html
   rt/branches/3.7-EXPERIMENTAL/html/Ticket/Display.html
   rt/branches/3.7-EXPERIMENTAL/html/Ticket/Forward.html

Log:
 r9502 at cubic-pc (orig r9501):  ruz | 2007-10-30 09:04:02 +0300
 * fetch actions from the session hash in ListActions
 ** we usually put htem there before redirect


Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/ListActions
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/ListActions	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/ListActions	Tue Nov  6 07:10:17 2007
@@ -53,6 +53,12 @@
   </ul>
 </&>
 <%init>
+
+if ( ref( $session{'Actions'} ) eq 'ARRAY' ) {
+    unshift @actions, @{ $session{'Actions'} };
+}
+delete $session{'Actions'};
+
 # XXX: run callbacks per row really crazy idea
 @actions =
     grep $_,

Modified: rt/branches/3.7-EXPERIMENTAL/html/SelfService/Display.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/SelfService/Display.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/SelfService/Display.html	Tue Nov  6 07:10:17 2007
@@ -215,12 +215,11 @@
         # We've done something, so we need to clear the decks to avoid
         # resubmission on refresh.
         # But we need to store Actions somewhere too, so we don't lose them.
-        $session{"Actions"} = \@results;
+        push @{ $session{"Actions"} ||= [] }, @results;
+        $session{'i'}++;
         RT::Interface::Web::Redirect(
             RT->Config->Get('WebURL') ."SelfService/Display.html?id=". $Ticket->id
         );
-    } else {
-        @results = @{ delete $session{"Actions"} || [] };
     }
 
     my $Transactions = $Ticket->Transactions;

Modified: rt/branches/3.7-EXPERIMENTAL/html/Ticket/Display.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Ticket/Display.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Ticket/Display.html	Tue Nov  6 07:10:17 2007
@@ -183,7 +183,9 @@
     # We've done something, so we need to clear the decks to avoid 
     # resubmission on refresh.
     # But we need to store Actions somewhere too, so we don't lose them.
-    $session{"Actions"} = \@Actions;
+    push @{ $session{"Actions"} ||= [] }, @Actions;
+    $session{'i'}++;
+
     RT::Interface::Web::Redirect(RT->Config->Get('WebURL') ."Ticket/Display.html?id=".$TicketObj->id);
 } else {
     @Actions = @{ delete $session{"Actions"} || [] };

Modified: rt/branches/3.7-EXPERIMENTAL/html/Ticket/Forward.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Ticket/Forward.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Ticket/Forward.html	Tue Nov  6 07:10:17 2007
@@ -98,8 +98,7 @@
 
     if ( $ForwardAndReturn ) {
         $session{'i'}++;
-        $session{"Actions"} ||= [];
-        push @{ $session{"Actions"} }, @results;
+        push @{ $session{"Actions"} ||= [] }, @results;
         RT::Interface::Web::Redirect(
             RT->Config->Get('WebURL') ."/Ticket/Display.html?id=". $id
         );