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

RotherOSS · Sep 30, 2024 · 0baa120 · 0baa120
2 parents 7e4f746 + 8fc2ab2
commit 0baa120
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/Kernel/Modules/AgentTicketQuickClose.pm b/Kernel/Modules/AgentTicketQuickClose.pm
@@ -127,6 +127,14 @@ sub _SetState {
 
     return if !$State;
 
+    if ( $Param{Config}{RequiredLock} ) {
+        $TicketObject->TicketOwnerSet(
+            TicketID  => $Self->{TicketID},
+            UserID    => $Self->{UserID},
+            NewUserID => $Self->{UserID},
+        );
+    }
+
     my $Success = $TicketObject->TicketStateSet(
         State    => $State,
         TicketID => $Self->{TicketID},

diff --git a/scripts/test/Selenium/Output/Preferences/Customer/Password.t b/scripts/test/Selenium/Output/Preferences/Customer/Password.t
@@ -72,8 +72,8 @@ $Selenium->RunTest(
             $Selenium->find_element( "#Update", 'css' )->VerifiedClick();
 
             # check for correct password update preferences message on screen
-            my $UpdateMessage = "Preferences updated successfully!";
-            $Selenium->content_contains( $UpdateMessage, 'Customer preference password - updated' );
+            my $UpdateMessage = "Session invalid. Please log in again.";
+            $Selenium->content_contains( $UpdateMessage, 'Customer preference password - updated and session invalidated.' );
         };
     }
 );