Merge branch 'rel-10_0' into rel-10_1

RotherOSS · Jan 22, 2025 · b008616 · b008616
2 parents d7c46a5 + e113ffc
commit b008616
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/Kernel/Modules/AdminProcessManagementActivity.pm b/Kernel/Modules/AdminProcessManagementActivity.pm
@@ -46,17 +46,17 @@ sub Run {
     my $ActivityID = $ParamObject->GetParam( Param => 'ID' )       || '';
     my $EntityID   = $ParamObject->GetParam( Param => 'EntityID' ) || '';
 
-    # get latest config data to send it back to main window
-    my $ActivityConfig = $Self->_GetActivityConfig(
-        EntityID => $EntityID,
-    );
-
     my %SessionData = $Kernel::OM->Get('Kernel::System::AuthSession')->GetSessionIDData(
         SessionID => $Self->{SessionID},
     );
 
     if ( !exists $SessionData{ProcessManagementScreensPath} ) {
 
+        # get latest config data to send it back to main window
+        my $ActivityConfig = $Self->_GetActivityConfig(
+            EntityID => $EntityID,
+        );
+
         # we lost session in between, close the popup and reload
         return $Self->_PopupResponse(
             ClosePopup => 1,
@@ -211,6 +211,11 @@ sub Run {
 
         my $Redirect = $ParamObject->GetParam( Param => 'PopupRedirect' ) || '';
 
+        # get latest config data to send it back to main window
+        my $ActivityConfig = $Self->_GetActivityConfig(
+            EntityID => $EntityID,
+        );
+
         # check if needed to open another window or if popup should go back
         if ( $Redirect && $Redirect eq '1' ) {