Issue #1060: First stub.

RotherOSS · Nov 1, 2021 · 5718796 · 5718796
1 parent 7c26a9b
commit 5718796
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 11 deletions.
diff --git a/Kernel/Modules/CustomerTicketProcess.pm b/Kernel/Modules/CustomerTicketProcess.pm
@@ -66,11 +66,11 @@ sub Run {
     my $ParamObject = $Kernel::OM->Get('Kernel::System::Web::Request');
 
     my $TicketID               = $ParamObject->GetParam( Param => 'TicketID' );
-    my $ActivityDialogEntityID = $ParamObject->GetParam( Param => 'ActivityDialogEntityID' );
+    my $ActivityDialogEntityID = $Param{ActivityDialogEntityID} || $ParamObject->GetParam( Param => 'ActivityDialogEntityID' );
     my $ActivityDialogHashRef;
 
     # get needed objects
-    my $LayoutObject         = $Kernel::OM->Get('Kernel::Output::HTML::Layout');
+    my $LayoutObject         = $Kernel::OM->Create('Kernel::Output::HTML::Layout');
     my $TicketObject         = $Kernel::OM->Get('Kernel::System::Ticket');
     my $ActivityDialogObject = $Kernel::OM->Get('Kernel::System::ProcessManagement::ActivityDialog');
 
@@ -1213,10 +1213,10 @@ sub _OutputActivityDialog {
     my $MainBoxClass;
 
     if ( !$Self->{IsMainWindow} ) {
-        $Output = $LayoutObject->CustomerHeader(
-            Type  => 'Small',
-            Value => $Ticket{Number},
-        );
+        #$Output = $LayoutObject->CustomerHeader(
+        #    Type  => 'Small',
+        #    Value => $Ticket{Number},
+        #);
 
         # display given notify messages if this is not an AJAX request
         if ( IsArrayRefWithData( $Param{Notify} ) ) {
@@ -1275,8 +1275,8 @@ sub _OutputActivityDialog {
         }
 
         # display complete header and nav bar in ajax dialogs when there is a server error
-        $Output = $LayoutObject->CustomerHeader();
-        $Output .= $LayoutObject->CustomerNavigationBar();
+        #$Output = $LayoutObject->CustomerHeader();
+        #$Output .= $LayoutObject->CustomerNavigationBar();
 
         # display original header texts (the process list maybe is not necessary)
         $Output .= $LayoutObject->Output(
@@ -4022,8 +4022,8 @@ sub _DisplayProcessList {
             FormID => $Self->{FormID},
         },
     );
-    my $Output = $LayoutObject->CustomerHeader();
-    $Output .= $LayoutObject->CustomerNavigationBar();
+    #my $Output = $LayoutObject->CustomerHeader();
+    #$Output .= $LayoutObject->CustomerNavigationBar();
 
     $Output .= $LayoutObject->Output(
         TemplateFile => 'CustomerTicketProcess',
@@ -4038,7 +4038,7 @@ sub _DisplayProcessList {
     # this options in the footer again
     $LayoutObject->{HasDatepicker} = 1;
 
-    $Output .= $LayoutObject->CustomerFooter();
+    #$Output .= $LayoutObject->CustomerFooter();
 
     return $Output;
 }

diff --git a/Kernel/Modules/CustomerTicketZoom.pm b/Kernel/Modules/CustomerTicketZoom.pm
@@ -1701,6 +1701,13 @@ sub _Mask {
                 $NextActivityDialogs = {};
             }
 
+            my $ProcessModule = ( 'Kernel::Modules::CustomerTicketProcess' )->new(
+                %{ $Self },
+                Action    => 'CustomerTicketProcess',
+                Subaction => 'DisplayActivityDialog',
+                ModuleReg => $ConfigObject->Get('CustomerFrontend::Module')->{ 'CustomerTicketProcess' },
+            );
+
             # we have to check if the current user has the needed permissions to view the
             # different activity dialogs, so we loop over every activity dialog and check if there
             # is a permission configured. If there is a permission configured we check this
@@ -1774,6 +1781,16 @@ sub _Mask {
                         TicketID               => $Param{TicketID},
                     },
                 );
+
+                my $ActivityHTML = $ProcessModule->Run(
+                    ActivityDialogEntityID => $NextActivityDialogs->{$NextActivityDialogKey},
+                );
+                $LayoutObject->Block(
+                    Name => 'ProcessActivity',
+                    Data => {
+                        ActivityHTML => $ActivityHTML,
+                    },
+                );
             }
 
             if ( !IsHashRefWithData($NextActivityDialogs) ) {

diff --git a/Kernel/Output/HTML/Templates/Standard/CustomerTicketZoom.tt b/Kernel/Output/HTML/Templates/Standard/CustomerTicketZoom.tt
@@ -43,6 +43,11 @@
         <ul id='oooArticleList'>
         </ul>
         <ul id='oooArticleListExpanded'>
+[% RenderBlockStart("ProcessActivity") %]
+            <li id="Process" class="">
+                [% Data.ActivityHTML %]
+            </li>
+[% RenderBlockEnd("ProcessActivity") %]
 [% RenderBlockStart("FollowUp") %]
 <li id="FollowUp" class="[% Data.FollowUpVisible | html %]">
     <form action="[% Env("CGIHandle") %]#FollowUp" method="post" enctype="multipart/form-data" name="compose" id="ReplyCustomerTicket" class="Validate PreventMultipleSubmits">