Issue #1060: First steps.

RotherOSS · Nov 2, 2021 · ed2b57a · ed2b57a
1 parent 65e99f1
commit ed2b57a
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 7 deletions.
diff --git a/Kernel/Modules/CustomerTicketProcess.pm b/Kernel/Modules/CustomerTicketProcess.pm
@@ -65,7 +65,7 @@ sub Run {
     # get param object
     my $ParamObject = $Kernel::OM->Get('Kernel::System::Web::Request');
 
-    my $TicketID               = $ParamObject->GetParam( Param => 'TicketID' );
+    my $TicketID               = $Self->{TicketID} || $ParamObject->GetParam( Param => 'TicketID' );
     my $ActivityDialogEntityID = $Param{ActivityDialogEntityID} || $ParamObject->GetParam( Param => 'ActivityDialogEntityID' );
     my $ActivityDialogHashRef;
 
@@ -201,7 +201,7 @@ sub Run {
         Interface    => [ 'AgentInterface', 'CustomerInterface' ],
     );
 
-    my $ProcessEntityID = $ParamObject->GetParam( Param => 'ProcessEntityID' );
+    my $ProcessEntityID = $Param{ProcessEntityID} || $ParamObject->GetParam( Param => 'ProcessEntityID' );
 
     if ( !IsHashRefWithData($ProcessList) && !IsHashRefWithData($FollowupProcessList) ) {
         return $LayoutObject->CustomerErrorScreen(
@@ -310,7 +310,9 @@ sub Run {
     # - Parameter checking before storing
     # - will be used for ACL checking later on
     my $GetParam = $Self->_GetParam(
-        ProcessEntityID => $ProcessEntityID,
+        ProcessEntityID        => $ProcessEntityID,
+        TicketID               => $TicketID,
+        ActivityDialogEntityID => $ActivityDialogEntityID,
     );
 
     if ( $Self->{Subaction} eq 'StoreActivityDialog' && $ProcessEntityID ) {
@@ -744,8 +746,8 @@ sub _GetParam {
     my %GetParam;
     my %Ticket;
     my $ProcessEntityID        = $Param{ProcessEntityID};
-    my $TicketID               = $ParamObject->GetParam( Param => 'TicketID' );
-    my $ActivityDialogEntityID = $ParamObject->GetParam(
+    my $TicketID               = $Param{TicketID} || $ParamObject->GetParam( Param => 'TicketID' );
+    my $ActivityDialogEntityID = $Param{ActivityDialogEntityID} || $ParamObject->GetParam(
         Param => 'ActivityDialogEntityID',
     );
     my $ActivityEntityID;
@@ -4025,7 +4027,7 @@ sub _DisplayProcessList {
     #my $Output = $LayoutObject->CustomerHeader();
     #$Output .= $LayoutObject->CustomerNavigationBar();
 
-    $Output .= $LayoutObject->Output(
+    my $Output .= $LayoutObject->Output(
         TemplateFile => 'CustomerTicketProcess',
         Data         => {
             FormID => $Self->{FormID},

diff --git a/Kernel/Modules/CustomerTicketZoom.pm b/Kernel/Modules/CustomerTicketZoom.pm
@@ -1701,6 +1701,7 @@ sub _Mask {
                 $NextActivityDialogs = {};
             }
 
+            $Kernel::OM->Get('Kernel::System::Main')->Require("Kernel::Modules::CustomerTicketProcess");
             my $ProcessModule = ( 'Kernel::Modules::CustomerTicketProcess' )->new(
                 %{ $Self },
                 Action    => 'CustomerTicketProcess',
@@ -1784,6 +1785,7 @@ sub _Mask {
 
                 my $ActivityHTML = $ProcessModule->Run(
                     ActivityDialogEntityID => $NextActivityDialogs->{$NextActivityDialogKey},
+                    ProcessEntityID        => $Param{$ProcessEntityIDField},
                 );
                 $LayoutObject->Block(
                     Name => 'ProcessActivity',

diff --git a/Kernel/Output/HTML/Templates/Standard/CustomerTicketZoom.tt b/Kernel/Output/HTML/Templates/Standard/CustomerTicketZoom.tt
@@ -40,11 +40,18 @@
         </div>
     </div>
     <div id='oooMainBox' class="Content">
+#[% RenderBlockStart("NextActivities") %]
+        <div id="Activities">
+[% RenderBlockStart("ActivityDialog") %]
+            <button id="Button_[% Data.ActivityDialogEntityID | uri %]" title="[% Data.Name | html %]">[% Data.Name | html %]</button>
+[% RenderBlockEnd("ActivityDialog") %]
+        </div>
+#[% RenderBlockEnd("NextActivities") %]
         <ul id='oooArticleList'>
         </ul>
         <ul id='oooArticleListExpanded'>
 [% RenderBlockStart("ProcessActivity") %]
-            <li id="Process" class="">
+            <li id="Process_[% Data.ActivityDialogEntityID | uri %]" class="">
                 [% Data.ActivityHTML %]
             </li>
 [% RenderBlockEnd("ProcessActivity") %]

diff --git a/var/httpd/htdocs/skins/Customer/default/css/Core.TicketZoom.css b/var/httpd/htdocs/skins/Customer/default/css/Core.TicketZoom.css
@@ -230,6 +230,14 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
         display: grid;
         grid-template-columns: minmax(0px, 32.6fr) minmax(0px, 67.4fr);
         grid-column-gap: 24px;
+        grid-template-rows: auto auto;
+        grid-row-gap: 0px;
+    }
+
+    #Activities {
+        grid-area: 1 / 1 / 2 / 3;
+        padding: 0;
+        margin: 0;
     }
 
     #oooArticleList {