Skip to content

Commit

Permalink
AgentTicketBulk: only redirect to Zoom for merges
Browse files Browse the repository at this point in the history
  • Loading branch information
moritz committed Apr 23, 2015
1 parent bdeadc4 commit 5e35c7c
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions Kernel/Modules/AgentTicketBulk.pm
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,6 @@ sub Run {

# process tickets
my @TicketIDSelected;
my @ResultTicketIDs;
my $LockedTickets = '';
my $ActionFlag = 0;
my $Counter = 1;
Expand Down Expand Up @@ -430,8 +429,6 @@ sub Run {

# do some actions on tickets
if ( ( $Self->{Subaction} eq 'Do' ) && ( !%Error ) ) {
push @ResultTicketIDs, $TicketID;

# challenge token check for write action
$Self->{LayoutObject}->ChallengeTokenCheck();

Expand Down Expand Up @@ -697,7 +694,6 @@ sub Run {
MergeTicketID => $TicketID,
UserID => $Self->{UserID},
);
@ResultTicketIDs = ( $MainTicketID );
}

# link all tickets to a parent
Expand Down Expand Up @@ -753,8 +749,8 @@ sub Run {

# redirect
if ($ActionFlag) {
my $DestURL = @ResultTicketIDs == 1
? "Action=AgentTicketZoom;TicketID=$ResultTicketIDs[0]"
my $DestURL = defined $MainTicketID
? "Action=AgentTicketZoom;TicketID=$MainTicketID"
: ( $Self->{LastScreenOverview} || 'Action=AgentDashboard' );

return $Self->{LayoutObject}->PopupClose(
Expand Down

0 comments on commit 5e35c7c

Please sign in to comment.