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

RotherOSS · Jan 9, 2025 · 54e8c59 · 54e8c59
2 parents 303ddf0 + fe0c78d
commit 54e8c59
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/Kernel/Modules/AdminProcessManagementActivity.pm b/Kernel/Modules/AdminProcessManagementActivity.pm
@@ -2,7 +2,7 @@
 # OTOBO is a web-based ticketing system for service organisations.
 # --
 # Copyright (C) 2001-2020 OTRS AG, https://otrs.com/
-# Copyright (C) 2019-2024 Rother OSS GmbH, https://otobo.io/
+# Copyright (C) 2019-2025 Rother OSS GmbH, https://otobo.io/
 # --
 # This program is free software: you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
@@ -46,10 +46,24 @@ 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} ) {
+
+        # we lost session in between, close the popup and reload
+        return $Self->_PopupResponse(
+            ClosePopup => 1,
+            ConfigJSON => $ActivityConfig,
+        );
+    }
+
     # convert JSON string to array
     $Self->{ScreensPath} = $Kernel::OM->Get('Kernel::System::JSON')->Decode(
         Data => $SessionData{ProcessManagementScreensPath}
@@ -197,11 +211,6 @@ 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' ) {
 

diff --git a/Kernel/Modules/AgentTicketEmailOutbound.pm b/Kernel/Modules/AgentTicketEmailOutbound.pm
@@ -785,7 +785,7 @@ sub Form {
 
     # Inform a user that article subject will be empty if contains only the ticket hook (if nothing is modified).
     $Output .= $LayoutObject->Notify(
-        Data => Translatable('Article subject will be empty if the subject contains only the ticket hook!'),
+        Data => $LayoutObject->{LanguageObject}->Translate('Article subject will be empty if the subject contains only the ticket hook!'),
     );
 
     $Output .= $Self->_Mask(