Skip to content

Commit

Permalink
Issue #1060: Remove unnecessary Config options. Add option where to r…
Browse files Browse the repository at this point in the history 
…edirect after process action.
  • Loading branch information
Sven committed Nov 8, 2021
1 parent c06263a commit 47bcb14
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 95 deletions.
94 changes: 10 additions & 84 deletions Kernel/Config/Files/XML/ProcessManagement.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -472,89 +472,6 @@
</Hash>
</Value>
</Setting>
<Setting Name="CustomerFrontend::Module###CustomerTicketProcess" Required="0" Valid="1">
<Description Translatable="1">Frontend module registration for the customer interface.</Description>
<Navigation>Frontend::Customer::ModuleRegistration</Navigation>
<Value>
<Item ValueType="FrontendRegistration">
<Hash>
<Item Key="Group">
<Array>
</Array>
</Item>
<Item Key="GroupRo">
<Array>
</Array>
</Item>
<Item Key="Description" Translatable="1">Process Ticket.</Item>
<Item Key="NavBarName">Ticket</Item>
<Item Key="Title" Translatable="1">Process ticket</Item>
</Hash>
</Item>
</Value>
</Setting>
<Setting Name="Loader::Module::CustomerTicketProcess###002-ProcessManagement" Required="0" Valid="1">
<Description Translatable="1">Loader module registration for the customer interface.</Description>
<Navigation>Frontend::Customer::ModuleRegistration::Loader</Navigation>
<Value>
<Hash>
<Item Key="CSS">
<Array>
<Item>Core.Customer.TicketProcess.css</Item>
</Array>
</Item>
<Item Key="JavaScript">
<Array>
<Item>Core.TicketProcess.js</Item>
<Item>Core.Customer.TicketProcess.js</Item>
<Item>Core.TicketProcess.js</Item>
</Array>
</Item>
</Hash>
</Value>
</Setting>
<Setting Name="CustomerFrontend::Navigation###CustomerTicketProcess###002-ProcessManagement" Required="0" Valid="1">
<Description Translatable="1">Main menu item registration.</Description>
<Navigation>Frontend::Customer::ModuleRegistration::MainMenu</Navigation>
<Value>
<Array>
<DefaultItem ValueType="FrontendNavigation">
<Hash>
</Hash>
</DefaultItem>
<Item>
<Hash>
<Item Key="Group">
<Array>
</Array>
</Item>
<Item Key="GroupRo">
<Array>
</Array>
</Item>
<Item Key="Description" Translatable="1">Create new process ticket.</Item>
<Item Key="Name" Translatable="1">New process ticket</Item>
<Item Key="Link">Action=CustomerTicketProcess</Item>
<Item Key="LinkOption"></Item>
<Item Key="NavBar">Ticket</Item>
<Item Key="Type">Submenu</Item>
<Item Key="Block"></Item>
<Item Key="AccessKey">o</Item>
<Item Key="Prio">220</Item>
</Hash>
</Item>
</Array>
</Value>
</Setting>
<Setting Name="CustomerFrontend::NavBarModule###10-CustomerTicketProcesses" Required="0" Valid="1">
<Description Translatable="1">Frontend module registration (disable ticket processes screen if no process available) for Customer.</Description>
<Navigation>Frontend::Customer::ModuleRegistration</Navigation>
<Value>
<Hash>
<Item Key="Module">Kernel::Output::HTML::NavBar::CustomerTicketProcess</Item>
</Hash>
</Value>
</Setting>
<!-- OTOBOTicketProcesses Merged Settings End -->
<Setting Name="Process::Entity::Prefix" Required="1" Valid="1">
<Description Translatable="1">Default ProcessManagement entity prefixes for entity IDs that are automatically generated.</Description>
Expand Down Expand Up @@ -719,5 +636,14 @@
</Hash>
</Value>
</Setting>

<Setting Name="Ticket::Frontend::CustomerTicketProcess###NextScreenAfterFollowUp" Required="1" Valid="1">
<Description Translatable="1">Determines the next screen after the process screen of a zoomed ticket in the customer interface.</Description>
<Navigation>Frontend::Customer::View::TicketProcess</Navigation>
<Value>
<Item ValueType="Select" SelectedID="CustomerTicketOverview">
<Item ValueType="Option" Value="CustomerTicketOverview" Translatable="1">Customer ticket overview</Item>
<Item ValueType="Option" Value="CustomerTicketZoom" Translatable="1">Customer ticket zoom</Item>
</Item>
</Value>
</Setting>
</otobo_config>
13 changes: 2 additions & 11 deletions Kernel/Modules/CustomerTicketProcess.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3399,18 +3399,9 @@ sub _StoreActivityDialog {

# Transitions will be handled by ticket event module (TicketProcessTransitions.pm).

# if we were updating a ticket, close the popup and return to zoom
# else (new ticket) just go to zoom to show the new ticket
if ($UpdateTicketID) {

# load new URL in parent window and close popup
return $LayoutObject->PopupClose(
URL => "Action=CustomerTicketZoom;TicketID=$UpdateTicketID",
);
}

my $NextScreen = $Self->{NextScreen} || $ConfigObject->Get('Ticket::Frontend::CustomerTicketProcess')->{'NextScreenAfterFollowUp'};
return $LayoutObject->Redirect(
OP => "Action=CustomerTicketZoom;TicketID=$TicketID",
OP => "Action=$NextScreen;TicketID=$TicketID",
);
}

Expand Down

0 comments on commit 47bcb14

Please sign in to comment.