Issue #2648: Introduce multiselect config param for dynamic field ref…

…erence. Fix handling of PossibleNone to prevent duplicated empty selection option.
RotherOSS · Nov 9, 2023 · 7b861f2 · 7b861f2
1 parent 5d72648
commit 7b861f2
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 5 deletions.
diff --git a/Kernel/Modules/AdminDynamicFieldReference.pm b/Kernel/Modules/AdminDynamicFieldReference.pm
@@ -290,6 +290,16 @@ sub _AddAction {
         $FieldConfig{$Name} = $GetParam{$Name};
     }
 
+    # interdependencies of multiselect, multivalue and editfieldmode
+    # set multiselect key for consistency in backend
+    $FieldConfig{Multiselect} = $FieldConfig{EditFieldMode} eq 'Multiselect' ? 1 : 0;
+
+    # differentiate only between autocomplete and dropdown
+    $FieldConfig{EditFieldMode} = $FieldConfig{EditFieldMode} eq 'AutoComplete' ? 'AutoComplete' : 'Dropdown';
+
+    # multiselect excludes multivalue
+    $FieldConfig{MultiValue} = $FieldConfig{Multiselect} ? 0 : $FieldConfig{MultiValue};
+
     $GetParam{ReferenceFilterCounter} = $ParamObject->GetParam( Param => 'ReferenceFilterCounter' ) || 0;
 
     my @ReferenceFilterList = $Self->_GetParamReferenceFilterList(
@@ -587,6 +597,16 @@ sub _ChangeAction {
         $FieldConfig{$Name} = $GetParam{$Name};
     }
 
+    # interdependencies of multiselect, multivalue and editfieldmode
+    # set multiselect key for consistency in backend
+    $FieldConfig{Multiselect} = $FieldConfig{EditFieldMode} eq 'Multiselect' ? 1 : 0;
+
+    # differentiate only between autocomplete and dropdown
+    $FieldConfig{EditFieldMode} = $FieldConfig{EditFieldMode} eq 'AutoComplete' ? 'AutoComplete' : 'Dropdown';
+
+    # multiselect excludes multivalue
+    $FieldConfig{MultiValue} = $FieldConfig{Multiselect} ? 0 : $FieldConfig{MultiValue};
+
     $GetParam{ReferenceFilterCounter} = $ParamObject->GetParam( Param => 'ReferenceFilterCounter' ) || 0;
 
     my @ReferenceFilterList = $Self->_GetParamReferenceFilterList(
@@ -759,6 +779,9 @@ sub _ShowScreen {
         Class         => 'Modernize W75pc Validate_Number',
     );
 
+    # compute value for editfieldmode to maintain frontend selection
+    $Param{EditFieldMode} = $Param{EditFieldMode} eq 'AutoComplete' ? 'AutoComplete' : ( $Param{Multiselect} ? 'Multiselect' : 'Dropdown' );
+
     # Selections may be set up in a declaritive way
     for my $Setting ( $Param{FieldTypeSettings}->@* ) {
         if ( $Setting->{InputType} eq 'Selection' ) {

diff --git a/Kernel/System/DynamicField/Driver/Reference.pm b/Kernel/System/DynamicField/Driver/Reference.pm
@@ -354,7 +354,7 @@ sub EditFieldRender {
                     Class        => $FieldClass,
                     HTMLQuote    => 1,
                     Translation  => $DFDetails->{Translation},
-                    PossibleNone => $DFDetails->{PossibleNone},
+                    PossibleNone => 0,
                 );
             }
         }
@@ -367,9 +367,9 @@ sub EditFieldRender {
                 SelectedID   => \@SelectedIDs,
                 Class        => $FieldClass,
                 HTMLQuote    => 1,
-                Multiple     => $DFDetails->{EditFieldMode} eq 'Multiselect' ? 1 : 0,
+                Multiple     => $DFDetails->{Multiselect},
                 Translation  => $DFDetails->{Translation},
-                PossibleNone => $DFDetails->{PossibleNone},
+                PossibleNone => 0,
             );
         }
     }
@@ -384,7 +384,7 @@ sub EditFieldRender {
         ObjectType => $DFDetails->{ReferencedObjectType},
     );
     my @ResultHTML;
-    for my $ValueIndex ( 0 .. ( $DFDetails->{EditFieldMode} eq 'Multiselect' ? 0 : $#{$Value} ) ) {
+    for my $ValueIndex ( 0 .. ( $DFDetails->{Multiselect} ? 0 : $#{$Value} ) ) {
         my $FieldID = $DFDetails->{MultiValue} ? $FieldName . '_' . $ValueIndex : $FieldName;
 
         if ( !$ValueIndex ) {
@@ -438,7 +438,7 @@ sub EditFieldRender {
             ID          => $FieldTemplateData{FieldID},
             Class       => $FieldClass,
             HTMLQuote   => 1,
-            Multiple    => $DFDetails->{EditFieldMode} eq 'Multiselect' ? 1 : 0,
+            Multiple    => $DFDetails->{Multiselect},
             Translation => $DFDetails->{TranslatableValues} || 0,
         );
         $TemplateHTML = $Param{LayoutObject}->Output(