[otrs-cvs] otrs/Kernel/Modules AdminProcessManagementTransition.pm, 1.15, 1.16 AdminProcessManagementPath.pm, 1.11, 1.12

Comments:
Update of /home/cvs/otrs/Kernel/Modules
In directory lancelot:/tmp/cvs-serv28055/Kernel/Modules

Modified Files:
	AdminProcessManagementTransition.pm 
	AdminProcessManagementPath.pm 
Log Message:
Added link in path popup to open transition edit screen.

Author: mn

Index: AdminProcessManagementTransition.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/AdminProcessManagementTransition.pm,v
retrieving revision 1.15
retrieving revision 1.16
diff -2 -u -d -r1.15 -r1.16
--- AdminProcessManagementTransition.pm	26 Nov 2012 13:45:48 -0000	1.15
+++ AdminProcessManagementTransition.pm	5 Feb 2013 09:36:54 -0000	1.16
@@ -1,5 +1,5 @@
 # --
 # Kernel/Modules/AdminProcessManagementTransition.pm - process management transition
-# Copyright (C) 2001-2012 OTRS AG, http://otrs.org/
+# Copyright (C) 2001-2013 OTRS AG, http://otrs.org/
 # --
 # $Id$
@@ -464,8 +464,9 @@
             Name => 'GoBack',
             Data => {
-                Action    => $Self->{ScreensPath}->[-1]->{Action}    || '',
-                Subaction => $Self->{ScreensPath}->[-1]->{Subaction} || '',
-                ID        => $Self->{ScreensPath}->[-1]->{ID}        || '',
-                EntityID  => $Self->{ScreensPath}->[-1]->{EntityID}  || '',
+                Action          => $Self->{ScreensPath}->[-1]->{Action}          || '',
+                Subaction       => $Self->{ScreensPath}->[-1]->{Subaction}       || '',
+                ID              => $Self->{ScreensPath}->[-1]->{ID}              || '',
+                EntityID        => $Self->{ScreensPath}->[-1]->{EntityID}        || '',
+                StartActivityID => $Self->{ScreensPath}->[-1]->{StartActivityID} || '',
             },
         );

Author: mn

Index: AdminProcessManagementPath.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/AdminProcessManagementPath.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -2 -u -d -r1.11 -r1.12
--- AdminProcessManagementPath.pm	23 Jan 2013 15:44:26 -0000	1.11
+++ AdminProcessManagementPath.pm	5 Feb 2013 09:36:55 -0000	1.12
@@ -161,11 +161,4 @@
         if ( $Redirect && $Redirect eq '1' ) {
 
-            $Self->_PushSessionScreen(
-                ID              => $TransferData->{ProcessEntityID},      # abuse!
-                EntityID        => $TransferData->{TransitionEntityID},
-                StartActivityID => $GetParam->{StartActivityID},
-                Subaction       => 'PathEdit'                             # always use edit screen
-            );
-
             my $RedirectAction
                 = $Self->{ParamObject}->GetParam( Param => 'PopupRedirectAction' ) || '';
@@ -176,4 +169,21 @@
                 = $Self->{ParamObject}->GetParam( Param => 'PopupRedirectEntityID' ) || '';
 
+            $Self->_PushSessionScreen(
+                ID       => $TransferData->{ProcessEntityID},    # abuse!
+                EntityID => $RedirectEntityID
+                ,    # needed, because the transition was changed before the submit
+                StartActivityID => $GetParam->{StartActivityID},
+                Subaction       => 'PathEdit'                      # always use edit screen
+            );
+
+            # get transition id
+            if ( $RedirectAction eq 'AdminProcessManagementTransition' && !$RedirectID ) {
+                my $Transition = $Self->{TransitionObject}->TransitionGet(
+                    EntityID => $RedirectEntityID,
+                    UserID   => $Self->{UserID},
+                );
+                $RedirectID = $Transition->{ID};
+            }
+
             # redirect to another popup window
             return $Self->_PopupResponse(
@@ -183,5 +193,5 @@
                     Subaction => $RedirectSubaction,
                     ID        => $RedirectID,
-                    EntityID  => $RedirectID,
+                    EntityID  => $RedirectEntityID,
                 },
                 ConfigJSON => $ConfigJSON,
---------------------------------------------------------------------
OTRS mailing list: cvs-log - Webpage: http://otrs.org/
Archive: http://lists.otrs.org/pipermail/cvs-log
To unsubscribe: http://lists.otrs.org/cgi-bin/listinfo/cvs-log