Issue #2685: Added check for renderable dynamic fields for calls to E…

…ditSectionRender function.
RotherOSS · Nov 17, 2023 · e1b7060 · e1b7060
1 parent cce1bcb
commit e1b7060
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 33 deletions.
diff --git a/Kernel/Modules/AgentTicketActionCommon.pm b/Kernel/Modules/AgentTicketActionCommon.pm
@@ -2203,8 +2203,8 @@ sub _Mask {
 
     # render ticket type dynamic fields
     my $TicketTypeDynamicFieldHTML;
-    {
-        my %DynamicFieldConfigs = map { $_->{Name} => $_ } grep { $_->{ObjectType} eq 'Ticket' } $Self->{DynamicField}->@*;
+    my %DynamicFieldConfigs = map { $_->{Name} => $_ } grep { $_->{ObjectType} eq 'Ticket' } $Self->{DynamicField}->@*;
+    if (%DynamicFieldConfigs) {
 
         $TicketTypeDynamicFieldHTML = $Kernel::OM->Get('Kernel::Output::HTML::DynamicField::Mask')->EditSectionRender(
             Content              => $Self->{TicketMaskDefinition},
@@ -2719,11 +2719,10 @@ sub _Mask {
         }
 
         # render article type dynamic fields
+        # TODO Think about usable implementation of article type dynamic field definition
+        my %DynamicFieldConfigs = map { $_->{Name} => $_ } grep { $_->{ObjectType} eq 'Article' } $Self->{DynamicField}->@*;
         my $ArticleTypeDynamicFieldHTML;
-        if ( IsArrayRefWithData( $Self->{ArticleMaskDefinition} ) ) {
-
-            # TODO Think about usable implementation of article type dynamic field definition
-            my %DynamicFieldConfigs = map { $_->{Name} => $_ } grep { $_->{ObjectType} eq 'Article' } $Self->{DynamicField}->@*;
+        if ( IsArrayRefWithData( $Self->{ArticleMaskDefinition} ) && %DynamicFieldConfigs ) {
 
             $ArticleTypeDynamicFieldHTML = $Kernel::OM->Get('Kernel::Output::HTML::DynamicField::Mask')->EditSectionRender(
                 Content              => $Self->{ArticleMaskDefinition},

diff --git a/Kernel/Modules/AgentTicketCompose.pm b/Kernel/Modules/AgentTicketCompose.pm
@@ -2222,8 +2222,8 @@ sub _Mask {
     );
 
     # render dynamic fields
-    {
-        my %DynamicFieldConfigs = map { $_->{Name} => $_ } $Self->{DynamicField}->@*;
+    my %DynamicFieldConfigs = map { $_->{Name} => $_ } $Self->{DynamicField}->@*;
+    if (%DynamicFieldConfigs) {
 
         # grep dynamic field values from ticket data
         my %DynamicFieldValues

diff --git a/Kernel/Modules/AgentTicketEmail.pm b/Kernel/Modules/AgentTicketEmail.pm
@@ -3514,8 +3514,8 @@ sub _MaskEmailNew {
     }
 
     # render dynamic fields
-    {
-        my %DynamicFieldConfigs = map { $_->{Name} => $_ } $Self->{DynamicField}->@*;
+    my %DynamicFieldConfigs = map { $_->{Name} => $_ } $Self->{DynamicField}->@*;
+    if (%DynamicFieldConfigs) {
 
         $Param{DynamicFieldHTML} = $Kernel::OM->Get('Kernel::Output::HTML::DynamicField::Mask')->EditSectionRender(
             Content              => $Self->{MaskDefinition},

diff --git a/Kernel/Modules/AgentTicketEmailOutbound.pm b/Kernel/Modules/AgentTicketEmailOutbound.pm
@@ -1964,8 +1964,8 @@ sub _Mask {
     }
 
     # render dynamic fields
-    {
-        my %DynamicFieldConfigs = map { $_->{Name} => $_ } $Self->{DynamicField}->@*;
+    my %DynamicFieldConfigs = map { $_->{Name} => $_ } $Self->{DynamicField}->@*;
+    if (%DynamicFieldConfigs) {
 
         $Param{DynamicFieldHTML} = $Kernel::OM->Get('Kernel::Output::HTML::DynamicField::Mask')->EditSectionRender(
             Content              => $Self->{MaskDefinition},

diff --git a/Kernel/Modules/AgentTicketForward.pm b/Kernel/Modules/AgentTicketForward.pm
@@ -1866,8 +1866,8 @@ sub _Mask {
     }
 
     # render dynamic fields
-    {
-        my %DynamicFieldConfigs = map { $_->{Name} => $_ } $Self->{DynamicField}->@*;
+    my %DynamicFieldConfigs = map { $_->{Name} => $_ } $Self->{DynamicField}->@*;
+    if (%DynamicFieldConfigs) {
 
         $Param{DynamicFieldHTML} = $Kernel::OM->Get('Kernel::Output::HTML::DynamicField::Mask')->EditSectionRender(
             Content              => $Self->{MaskDefinition},

diff --git a/Kernel/Modules/AgentTicketMove.pm b/Kernel/Modules/AgentTicketMove.pm
@@ -1490,8 +1490,8 @@ sub AgentMove {
     );
 
     # render dynamic fields
-    {
-        my %DynamicFieldConfigs = map { $_->{Name} => $_ } $Self->{DynamicField}->@*;
+    my %DynamicFieldConfigs = map { $_->{Name} => $_ } $Self->{DynamicField}->@*;
+    if (%DynamicFieldConfigs) {
 
         # grep dynamic field values from ticket data
         my %DynamicFieldValues
@@ -1514,14 +1514,12 @@ sub AgentMove {
             },
         );
 
-        if ( $Self->{DynamicField} ) {
-            $LayoutObject->Block(
-                Name => 'WidgetDynamicFields',
-                Data => {
-                    DynamicFieldHTML => $DynamicFieldHTML,
-                },
-            );
-        }
+        $LayoutObject->Block(
+            Name => 'WidgetDynamicFields',
+            Data => {
+                DynamicFieldHTML => $DynamicFieldHTML,
+            },
+        );
 
     }
 

diff --git a/Kernel/Modules/AgentTicketPhone.pm b/Kernel/Modules/AgentTicketPhone.pm
@@ -3147,8 +3147,8 @@ sub _MaskPhoneNew {
     }
 
     # render dynamic fields
-    {
-        my %DynamicFieldConfigs = map { $_->{Name} => $_ } $Self->{DynamicField}->@*;
+    my %DynamicFieldConfigs = map { $_->{Name} => $_ } $Self->{DynamicField}->@*;
+    if (%DynamicFieldConfigs) {
 
         $Param{DynamicFieldHTML} = $Kernel::OM->Get('Kernel::Output::HTML::DynamicField::Mask')->EditSectionRender(
             Content              => $Self->{MaskDefinition},

diff --git a/Kernel/Modules/AgentTicketPhoneCommon.pm b/Kernel/Modules/AgentTicketPhoneCommon.pm
@@ -1418,8 +1418,8 @@ sub _MaskPhone {
     }
 
     # render dynamic fields
-    {
-        my %DynamicFieldConfigs = map { $_->{Name} => $_ } $Self->{DynamicField}->@*;
+    my %DynamicFieldConfigs = map { $_->{Name} => $_ } $Self->{DynamicField}->@*;
+    if (%DynamicFieldConfigs) {
 
         $Param{DynamicFieldHTML} = $Kernel::OM->Get('Kernel::Output::HTML::DynamicField::Mask')->EditSectionRender(
             Content              => $Self->{MaskDefinition},

diff --git a/Kernel/Modules/CustomerTicketMessage.pm b/Kernel/Modules/CustomerTicketMessage.pm
@@ -1844,8 +1844,8 @@ sub _MaskNew {
     my $SeparateDynamicFields = $ConfigObject->Get('Ticket::CustomerFrontend::SeparateDynamicFields');
 
     # render dynamic fields
-    {
-        my %DynamicFieldConfigs = map { $_->{Name} => $_ } $Self->{DynamicField}->@*;
+    my %DynamicFieldConfigs = map { $_->{Name} => $_ } $Self->{DynamicField}->@*;
+    if (%DynamicFieldConfigs) {
 
         $Param{DynamicFieldHTML} = $Kernel::OM->Get('Kernel::Output::HTML::DynamicField::Mask')->EditSectionRender(
             Content              => $Self->{MaskDefinition},

diff --git a/Kernel/Modules/CustomerTicketZoom.pm b/Kernel/Modules/CustomerTicketZoom.pm
@@ -2417,9 +2417,8 @@ sub _Mask {
         my $SeparateDynamicFields = $ConfigObject->Get('Ticket::CustomerFrontend::SeparateDynamicFields');
 
         # render dynamic fields
-        if ( $Self->{FollowUpDynamicField}->@* ) {
-
-            my %DynamicFieldConfigs = map { $_->{Name} => $_ } $Self->{FollowUpDynamicField}->@*;
+        my %DynamicFieldConfigs = map { $_->{Name} => $_ } $Self->{FollowUpDynamicField}->@*;
+        if (%DynamicFieldConfigs) {
 
             # grep dynamic field values
             my %DynamicFieldValues = map { $_ => $Param{$_} } grep {/^DynamicField_/} keys %Param;