Skip to content

Sector Nord AG: Bugfix AgentTicketMove - RequiredLock should be needed for the TicketLockCheck #716

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LuBroering wants to merge 3 commits into
base: dev
Choose a base branch
from
+69 −110
Open

Sector Nord AG: Bugfix AgentTicketMove - RequiredLock should be needed for the TicketLockCheck #716

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
397e0bd
fix for proper handling of RequiredLock
LuBroering Sep 10, 2025
6df37b5
update file
LuBroering Sep 10, 2025
d34b65c
new line on file end
LuBroering Sep 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
179 changes: 69 additions & 110 deletions Kernel/Modules/AgentTicketMove.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,35 +116,6 @@ sub Run {
);
}

# 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.'),
);

# show back link
$LayoutObject->Block(
Name => 'TicketBack',
Data => { %Param, TicketID => $Self->{TicketID} },
);

$Output .= $LayoutObject->Footer(
Type => 'Small',
);
return $Output;
}
}

# ticket attributes
my %Ticket = $TicketObject->TicketGet(
TicketID => $Self->{TicketID},
Expand Down Expand Up @@ -193,6 +164,70 @@ sub Run {
$ObjectType = [ 'Ticket', 'Article' ];
}

# get lock state
if ( $Config->{RequiredLock} ) {
if ( !$TicketObject->TicketLockGet( TicketID => $Self->{TicketID} ) ) {

my $Lock = $TicketObject->TicketLockSet(
TicketID => $Self->{TicketID},
Lock => 'lock',
UserID => $Self->{UserID}
);

if ($Lock) {

# Set new owner if ticket owner is different then logged user.
if ( $Ticket{OwnerID} != $Self->{UserID} ) {

# Remember previous owner, which will be used to restore ticket owner on undo action.
$Param{PreviousOwner} = $Ticket{OwnerID};

$TicketObject->TicketOwnerSet(
TicketID => $Self->{TicketID},
UserID => $Self->{UserID},
NewUserID => $Self->{UserID},
);
}

# Show lock state.
$LayoutObject->Block(
Name => 'PropertiesLock',
Data => {
%Param,
TicketID => $Self->{TicketID},
},
);
}
}
else {
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.'),
);

# show back link
$LayoutObject->Block(
Name => 'TicketBack',
Data => { %Param, TicketID => $Self->{TicketID} },
);

$Output .= $LayoutObject->Footer(
Type => 'Small',
);
return $Output;
}
}
}

# get the dynamic fields for this screen
my $DynamicField = $Kernel::OM->Get('Kernel::System::DynamicField')->DynamicFieldListGet(
Valid => 1,
Expand Down Expand Up @@ -892,87 +927,11 @@ sub Run {
BodyClass => 'Popup',
);

# check if lock is required
if ( $Config->{RequiredLock} ) {

# get lock state && write (lock) permissions
if ( !$TicketObject->TicketLockGet( TicketID => $Self->{TicketID} ) ) {

my $Lock = $TicketObject->TicketLockSet(
TicketID => $Self->{TicketID},
Lock => 'lock',
UserID => $Self->{UserID}
);

if ($Lock) {

# Set new owner if ticket owner is different then logged user.
if ( $Ticket{OwnerID} != $Self->{UserID} ) {

# Remember previous owner, which will be used to restore ticket owner on undo action.
$Param{PreviousOwner} = $Ticket{OwnerID};

$TicketObject->TicketOwnerSet(
TicketID => $Self->{TicketID},
UserID => $Self->{UserID},
NewUserID => $Self->{UserID},
);
}

# Show lock state.
$LayoutObject->Block(
Name => 'PropertiesLock',
Data => {
%Param,
TicketID => $Self->{TicketID}
},
);
$TicketUnlock = 1;
}
}
else {
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.'),
);

# show back link
$LayoutObject->Block(
Name => 'TicketBack',
Data => { %Param, TicketID => $Self->{TicketID} },
);

$Output .= $LayoutObject->Footer(
Type => 'Small',
);
return $Output;
}

# show back link
$LayoutObject->Block(
Name => 'TicketBack',
Data => { %Param, TicketID => $Self->{TicketID} },
);
}
}
else {

# show back link
$LayoutObject->Block(
Name => 'TicketBack',
Data => { %Param, TicketID => $Self->{TicketID} },
);
}
# show back link
$LayoutObject->Block(
Name => 'TicketBack',
Data => { %Param, TicketID => $Self->{TicketID} },
);

# fetch all queues
my %MoveQueues = $TicketObject->MoveList(
Expand Down
Loading