Issue #2251: Adjusted dynamic field drivers to pass on readonly attri…

…bute.
RotherOSS · Nov 21, 2023 · d2c6428 · d2c6428
1 parent 8431eef
commit d2c6428
Show file tree

Hide file tree

Showing 11 changed files with 62 additions and 18 deletions.
diff --git a/Kernel/System/DynamicField/Driver/BaseDatabase.pm b/Kernel/System/DynamicField/Driver/BaseDatabase.pm
@@ -466,7 +466,7 @@ sub EditFieldValueGet {
     {
         my @Data = $Param{ParamObject}->GetArray( Param => $FieldName );
 
-        if ( $Param{DynamicFieldConfig}->{Config}->{MultiValue} ) {
+        if ( $Param{DynamicFieldConfig}->{Config}{MultiValue} && !$Param{DynamicFieldConfig}->{Readonly} ) {
 
             # delete the template value
             pop @Data;

diff --git a/Kernel/System/DynamicField/Driver/BaseDateTime.pm b/Kernel/System/DynamicField/Driver/BaseDateTime.pm
@@ -419,7 +419,7 @@ sub EditFieldValueGet {
         && ref $Param{ParamObject} eq 'Kernel::System::Web::Request'
         )
     {
-        if ( $Param{DynamicFieldConfig}->{Config}->{MultiValue} ) {
+        if ( $Param{DynamicFieldConfig}->{Config}{MultiValue} ) {
             my %Data;
 
             # retrieve value parts as arrays

diff --git a/Kernel/System/DynamicField/Driver/BaseEntity.pm b/Kernel/System/DynamicField/Driver/BaseEntity.pm
@@ -270,7 +270,7 @@ sub EditFieldRender {
             my $FieldID = $FieldName . '_' . $ValueIndex;
             push @SelectionHTML, $Param{LayoutObject}->BuildSelection(
                 Data       => $PossibleValues || {},
-                Disabled   => $Param{Readonly},
+                Readonly   => $Param{Readonly},
                 Name       => $FieldName,
                 ID         => $FieldID,
                 SelectedID => $Value->[$ValueIndex],
@@ -283,7 +283,7 @@ sub EditFieldRender {
         my @SelectedIDs = grep {$_} $Value->@*;
         push @SelectionHTML, $Param{LayoutObject}->BuildSelection(
             Data       => $PossibleValues || {},
-            Disabled   => $Param{Readonly},
+            Readonly   => $Param{Readonly},
             Name       => $FieldName,
             SelectedID => \@SelectedIDs,
             Class      => $FieldClass,
@@ -332,7 +332,6 @@ sub EditFieldRender {
 
         my $SelectionHTML = $Param{LayoutObject}->BuildSelection(
             Data        => $PossibleValues || {},
-            Disabled    => $Param{Readonly},
             Name        => $FieldName,
             ID          => $FieldTemplateData{FieldID},
             Translation => $FieldConfig->{TranslatableValues} || 0,
@@ -415,7 +414,7 @@ sub EditFieldValueGet {
     {
         my @Data = $Param{ParamObject}->GetArray( Param => $FieldName );
 
-        if ( $Param{DynamicFieldConfig}->{Config}{MultiValue} ) {
+        if ( $Param{DynamicFieldConfig}->{Config}{MultiValue} && !$Param{DynamicFieldConfig}->{Readonly} ) {
 
             # delete the template value
             pop @Data;

diff --git a/Kernel/System/DynamicField/Driver/BaseScript.pm b/Kernel/System/DynamicField/Driver/BaseScript.pm
@@ -320,7 +320,9 @@ sub EditFieldValueGet {
         )
     {
         $Value = $Param{ParamObject}->GetParam( Param => $FieldName );
-        if ( $Param{DynamicFieldConfig}->{Config}->{MultiValue} ) {
+
+        # TODO check what happens with template data
+        if ( $Param{DynamicFieldConfig}->{Config}{MultiValue} ) {
             my @DataAll = $Param{ParamObject}->GetArray( Param => $FieldName );
             my @Data;
 

diff --git a/Kernel/System/DynamicField/Driver/BaseSelect.pm b/Kernel/System/DynamicField/Driver/BaseSelect.pm
@@ -347,7 +347,7 @@ sub EditFieldRender {
 
         my $SelectionHTML = $Param{LayoutObject}->BuildSelection(
             Data        => $DataValues || {},
-            Disabled    => $Param{Readonly},
+            Readonly    => $Param{Readonly},
             Name        => $FieldName,
             ID          => $FieldID,
             SelectedID  => $Value->[$ValueIndex],
@@ -470,7 +470,9 @@ sub EditFieldValueGet {
             my @Data;
 
             # delete the template value
-            pop @DataAll;
+            if ( !$Param{DynamicFieldConfig}->{Readonly} ) {
+                pop @DataAll;
+            }
 
             for my $Item (@DataAll) {
                 push @Data, $Item // '';

diff --git a/Kernel/System/DynamicField/Driver/BaseText.pm b/Kernel/System/DynamicField/Driver/BaseText.pm
@@ -484,7 +484,9 @@ sub EditFieldValueGet {
             my @Data;
 
             # delete the template value
-            pop @DataAll;
+            if ( !$Param{DynamicFieldConfig}->{Readonly} ) {
+                pop @DataAll;
+            }
 
             # delete empty values (can happen if the user has selected the "-" entry)
             for my $Item (@DataAll) {

diff --git a/Kernel/System/DynamicField/Driver/Checkbox.pm b/Kernel/System/DynamicField/Driver/Checkbox.pm
@@ -531,7 +531,7 @@ sub EditFieldValueGet {
         && ref $Param{ParamObject} eq 'Kernel::System::Web::Request'
         )
     {
-        if ( $Param{DynamicFieldConfig}->{Config}->{MultiValue} ) {
+        if ( $Param{DynamicFieldConfig}->{Config}{MultiValue} ) {
             my @DataValues = $Param{ParamObject}->GetArray( Param => $FieldName );
             my @DataUsed   = $Param{ParamObject}->GetArray( Param => $FieldName . 'Used' );
 

diff --git a/Kernel/System/DynamicField/Driver/Date.pm b/Kernel/System/DynamicField/Driver/Date.pm
@@ -522,7 +522,7 @@ sub EditFieldValueGet {
         && ref $Param{ParamObject} eq 'Kernel::System::Web::Request'
         )
     {
-        if ( $Param{DynamicFieldConfig}->{Config}->{MultiValue} ) {
+        if ( $Param{DynamicFieldConfig}->{Config}{MultiValue} ) {
             my %Data;
 
             # retrieve value parts as arrays

diff --git a/Kernel/System/DynamicField/Driver/Multiselect.pm b/Kernel/System/DynamicField/Driver/Multiselect.pm
@@ -376,6 +376,7 @@ sub EditFieldRender {
         Class       => $FieldClass,
         HTMLQuote   => 1,
         Multiple    => 1,
+        Readonly    => $Param{Readonly},
     );
 
     my %FieldTemplateData = (

diff --git a/Kernel/System/DynamicField/Driver/Reference.pm b/Kernel/System/DynamicField/Driver/Reference.pm
@@ -324,7 +324,7 @@ sub EditFieldRender {
                 my $FieldID = $FieldName . '_' . $ValueIndex;
                 push @SelectionHTML, $Param{LayoutObject}->BuildSelection(
                     Data         => $PossibleValues || {},
-                    Disabled     => $Param{Readonly},
+                    Readonly     => $Param{Readonly},
                     Name         => $FieldName,
                     ID           => $FieldID,
                     SelectedID   => $Value->[$ValueIndex],
@@ -339,7 +339,7 @@ sub EditFieldRender {
             my @SelectedIDs = grep {$_} $Value->@*;
             push @SelectionHTML, $Param{LayoutObject}->BuildSelection(
                 Data         => $PossibleValues || {},
-                Disabled     => $Param{Readonly},
+                Readonly     => $Param{Readonly},
                 Name         => $FieldName,
                 SelectedID   => \@SelectedIDs,
                 Class        => $FieldClass,
@@ -410,7 +410,6 @@ sub EditFieldRender {
 
         my $SelectionHTML = $Param{LayoutObject}->BuildSelection(
             Data        => $PossibleValues || {},
-            Disabled    => $Param{Readonly},
             Name        => $FieldName,
             ID          => $FieldTemplateData{FieldID},
             Class       => $FieldClass,
@@ -480,6 +479,43 @@ sub EditFieldValueGet {
 
     # get the value from the parent class
     my $Value = $Self->SUPER::EditFieldValueGet(%Param);
+    my $FieldName = 'DynamicField_' . $Param{DynamicFieldConfig}->{Name};
+
+    my $Value;
+
+    # check if there is a Template and retrieve the dynamic field value from there
+    if ( IsHashRefWithData( $Param{Template} ) && defined $Param{Template}->{$FieldName} ) {
+        $Value = $Param{Template}->{$FieldName};
+    }
+
+    # otherwise get dynamic field value from the web request
+    elsif (
+        defined $Param{ParamObject}
+        && ref $Param{ParamObject} eq 'Kernel::System::Web::Request'
+        )
+    {
+        if ( $Param{DynamicFieldConfig}->{Config}{MultiValue} ) {
+            my @DataAll = $Param{ParamObject}->GetArray( Param => $FieldName );
+
+            # delete the template value
+            if ( !$Param{DynamicFieldConfig}->{Readonly} ) {
+                pop @DataAll;
+            }
+
+            # delete empty values (can happen if the user has selected the "-" entry)
+            $Value = [ map { $_ // '' } @DataAll ];
+        }
+        else {
+            $Value = $Param{ParamObject}->GetParam( Param => $FieldName );
+        }
+    }
+
+    if ( defined $Param{ReturnTemplateStructure} && $Param{ReturnTemplateStructure} eq '1' ) {
+        return {
+            $FieldName => $Value,
+        };
+    }
+>>>>>>> e480c1fbd (Issue #2251: Adjusted dynamic field drivers to pass on readonly attribute.)
 
     # for this field the normal return an the ReturnValueStructure are the same
     return $Value unless $Param{ForLens};

diff --git a/Kernel/System/DynamicField/Driver/WebService.pm b/Kernel/System/DynamicField/Driver/WebService.pm
@@ -282,7 +282,7 @@ sub EditFieldRender {
 
         my $SelectionHTML = $Param{LayoutObject}->BuildSelection(
             Data        => $DataValues || {},
-            Disabled    => $Param{Readonly},
+            Readonly    => $Param{Readonly},
             Name        => $FieldName,
             ID          => $FieldID,
             SelectedID  => $Value->[$ValueIndex],
@@ -403,10 +403,12 @@ sub EditFieldValueGet {
     {
         my @Data = $Param{ParamObject}->GetArray( Param => $FieldName );
 
-        if ( $Param{DynamicFieldConfig}->{Config}->{MultiValue} ) {
+        if ( $Param{DynamicFieldConfig}->{Config}{MultiValue} ) {
 
             # delete the template value
-            pop @Data;
+            if ( !$Param{DynamicFieldConfig}->{Readonly} ) {
+                pop @Data;
+            }
             $Value = \@Data;
 
         }