Issue #2153: Change sysconfig name, small code restructuring, for nic…

…er diffs with older versions.
RotherOSS · May 3, 2024 · 925e4e7 · 925e4e7
1 parent 3d9f3f9
commit 925e4e7
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 30 deletions.
diff --git a/Kernel/Config/Files/XML/Ticket.xml b/Kernel/Config/Files/XML/Ticket.xml
@@ -4759,7 +4759,7 @@
             </Item>
         </Value>
     </Setting>
-    <Setting Name="Ticket::Frontend::MoveType::Dropdown::MoveTicketEvenItIsLocked" Required="1" Valid="1">
+    <Setting Name="Ticket::Frontend::MoveType::Dropdown::MoveEvenIfLocked" Required="1" Valid="1">
         <Description Translatable="1">As soon as the move queue option dropdown is enabled for example in the AgentTicketZoom dialogue, it is possible to move tickets locked to other agents to another queue by activating this option.</Description>
         <Navigation>Frontend::Agent::View::TicketMove</Navigation>
         <Value>

diff --git a/Kernel/Modules/AgentTicketMove.pm b/Kernel/Modules/AgentTicketMove.pm
@@ -180,39 +180,33 @@ sub Run {
     # get config object
     my $ConfigObject = $Kernel::OM->Get('Kernel::Config');
 
-    # check if lock check is needed or disabled
-    my $MoveTicketEvenItIsLocked = $ConfigObject->Get('Ticket::Frontend::MoveType::Dropdown::MoveTicketEvenItIsLocked');
-
-    if ( !$MoveTicketEvenItIsLocked ) {
+    # check if ticket is locked
+    if ( !$ConfigObject->Get('Ticket::Frontend::MoveType::Dropdown::MoveEvenIfLocked') && $TicketObject->TicketLockGet( TicketID => $Self->{TicketID} ) ) {
+        my $AccessOk = $TicketObject->OwnerCheck(
+            TicketID => $Self->{TicketID},
+            OwnerID  => $Self->{UserID},
+        );
 
-        # check if ticket is locked
-        if ( $TicketObject->TicketLockGet( TicketID => $Self->{TicketID} ) ) {
-            my $AccessOk = $TicketObject->OwnerCheck(
-                TicketID => $Self->{TicketID},
-                OwnerID  => $Self->{UserID},
+        if ( !$AccessOk ) {
+            my $Output = $LayoutObject->Header(
+                Type      => 'Small',
+                BodyClass => 'Popup',
+            );
+            $Output .= $LayoutObject->Warning(
+                Message => Translatable('Sorry, you need to be the ticket owner to perform this action.'),
+                Comment => Translatable('Please change the owner first.'),
             );
 
-            if ( !$AccessOk ) {
-                my $Output = $LayoutObject->Header(
-                    Type      => 'Small',
-                    BodyClass => 'Popup',
-                );
-                $Output .= $LayoutObject->Warning(
-                    Message => Translatable('Sorry, you need to be the ticket owner to perform this action.'),
-                    Comment => Translatable('Please change the owner first.'),
-                );
-
-                # show back link
-                $LayoutObject->Block(
-                    Name => 'TicketBack',
-                    Data => { %Param, TicketID => $Self->{TicketID} },
-                );
+            # show back link
+            $LayoutObject->Block(
+                Name => 'TicketBack',
+                Data => { %Param, TicketID => $Self->{TicketID} },
+            );
 
-                $Output .= $LayoutObject->Footer(
-                    Type => 'Small',
-                );
-                return $Output;
-            }
+            $Output .= $LayoutObject->Footer(
+                Type => 'Small',
+            );
+            return $Output;
         }
     }