Issue #2866: Made dynamic field configs dependend upon relevant checks.

RotherOSS · Jan 24, 2024 · b2ae6f2 · b2ae6f2
1 parent 7c86752
commit b2ae6f2
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 12 deletions.
diff --git a/Kernel/Output/HTML/TicketZoom/Agent/Base.pm b/Kernel/Output/HTML/TicketZoom/Agent/Base.pm
@@ -31,6 +31,7 @@ our @ObjectDependencies = (
     'Kernel::System::Encode',
     'Kernel::System::Log',
     'Kernel::System::SystemAddress',
+    'Kernel::System::Ticket',
     'Kernel::System::Ticket::Article',
     'Kernel::System::User',
 );
@@ -126,17 +127,29 @@ sub ArticleMetaFields {
         }
     }
 
+    # check if ticket is normal or process ticket
+    my $IsProcessTicket = $Kernel::OM->Get('Kernel::System::Ticket')->TicketCheckForProcessType(
+        TicketID => $Param{TicketID}
+    );
+
+    # get zoom settings
+    my $DisplaySettings = $ConfigObject->Get("Ticket::Frontend::AgentTicketZoom");
+
     # get dynamic field config for frontend module
     my $DynamicFieldFilter = {
-        %{ $ConfigObject->Get("Ticket::Frontend::AgentTicketZoom")->{DynamicField} || {} },
-        %{
-            $ConfigObject->Get("Ticket::Frontend::AgentTicketZoom")->{DynamicFieldWidgetDynamicField}
+        %{ $DisplaySettings->{DynamicField} || {} },
+        IsHashRefWithData( $DisplaySettings->{DynamicFieldWidgetDisplay} )
+        ? %{
+            $DisplaySettings->{DynamicFieldWidgetDynamicField}
                 || {}
-        },
-        %{
-            $ConfigObject->Get("Ticket::Frontend::AgentTicketZoom")->{ProcessWidgetDynamicField}
+            }
+        : (),
+        $IsProcessTicket
+        ? %{
+            $DisplaySettings->{ProcessWidgetDynamicField}
                 || {}
-        },
+            }
+        : (),
     };
 
     # get the dynamic fields for article object

diff --git a/Kernel/Output/HTML/TicketZoom/TicketInformation.pm b/Kernel/Output/HTML/TicketZoom/TicketInformation.pm
@@ -371,19 +371,22 @@ sub Run {
         );
     }
 
-    # TODO order of dynamic field configs here differs from similar places - check why
     # get dynamic field config for frontend module
     my $DynamicFieldFilter = {
-        %{
+        IsHashRefWithData( $Self->{DisplaySettings}{DynamicFieldWidgetDisplay} )
+        ? %{
             $ConfigObject->Get("Ticket::Frontend::AgentTicketZoom")
                 ->{DynamicFieldWidgetDynamicField}
                 || {}
-        },
-        %{
+            }
+        : (),
+        $IsProcessTicket
+        ? %{
             $ConfigObject->Get("Ticket::Frontend::AgentTicketZoom")
                 ->{ProcessWidgetDynamicField}
                 || {}
-        },
+            }
+        : (),
         %{ $ConfigObject->Get("Ticket::Frontend::AgentTicketZoom")->{DynamicField} || {} },
     };