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

…bute.
RotherOSS · Feb 6, 2024 · aa2c348 · aa2c348
1 parent c2bb8c3
commit aa2c348
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 15 deletions.
diff --git a/Kernel/System/DynamicField/Driver/BaseDatabase.pm b/Kernel/System/DynamicField/Driver/BaseDatabase.pm
@@ -470,7 +470,9 @@ sub EditFieldValueGet {
             my @Data = $Param{ParamObject}->GetArray( Param => $FieldName );
 
             # delete the template value
-            pop @Data;
+            if ( !$Param{DynamicFieldConfig}->{Readonly} ) {
+                pop @Data;
+            }
 
             $Value = \@Data;
         }

diff --git a/Kernel/System/DynamicField/Driver/BaseDateTime.pm b/Kernel/System/DynamicField/Driver/BaseDateTime.pm
@@ -424,7 +424,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
@@ -276,7 +276,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],
@@ -289,7 +289,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,
@@ -338,7 +338,6 @@ sub EditFieldRender {
 
         my $SelectionHTML = $Param{LayoutObject}->BuildSelection(
             Data        => $PossibleValues || {},
-            Disabled    => $Param{Readonly},
             Name        => $FieldName,
             ID          => $FieldTemplateData{FieldID},
             Translation => $FieldConfig->{TranslatableValues} || 0,
@@ -421,7 +420,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
@@ -382,7 +382,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
@@ -350,7 +350,7 @@ sub EditFieldRender {
 
         my $SelectionHTML = $Param{LayoutObject}->BuildSelection(
             Data        => $DataValues || {},
-            Disabled    => $Param{Readonly},
+            Readonly    => $Param{Readonly},
             Name        => $FieldName,
             ID          => $FieldID,
             SelectedID  => $Value->[$ValueIndex],
@@ -473,7 +473,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
@@ -487,7 +487,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
@@ -562,7 +562,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
@@ -532,7 +532,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/WebService.pm b/Kernel/System/DynamicField/Driver/WebService.pm
@@ -285,7 +285,7 @@ sub EditFieldRender {
 
         my $SelectionHTML = $Param{LayoutObject}->BuildSelection(
             Data        => $DataValues || {},
-            Disabled    => $Param{Readonly},
+            Readonly    => $Param{Readonly},
             Name        => $FieldName,
             ID          => $FieldID,
             SelectedID  => $Value->[$ValueIndex],
@@ -406,10 +406,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;
 
         }