5984 fix finding selected enum value in choices

EasyCorp · Nov 1, 2023 · a94b7a0 · a94b7a0
1 parent bf76d49
commit a94b7a0
Show file tree

Hide file tree

Showing 4 changed files with 290 additions and 288 deletions.
diff --git a/src/Field/Configurator/ChoiceConfigurator.php b/src/Field/Configurator/ChoiceConfigurator.php
@@ -107,6 +107,11 @@ public function configure(FieldDto $field, EntityDto $entityDto, AdminContext $c
         // Translatable choice don't need to get flipped
         $flippedChoices = $areChoicesTranslatable ? $choices : array_flip($this->flatten($choices));
         foreach ((array) $fieldValue as $selectedValue) {
+            if ($selectedValue instanceof \BackedEnum) {
+                $selectedValue = $selectedValue->value;
+            } elseif ($selectedValue instanceof \UnitEnum) {
+                $selectedValue = $selectedValue->name;
+            }
             if (null !== $selectedLabel = $flippedChoices[$selectedValue] ?? null) {
                 if ($selectedLabel instanceof TranslatableInterface) {
                     $choiceMessage = $selectedLabel;

diff --git a/src/Resources/public/app.052a1081.css b/src/Resources/public/app.052a1081.css
diff --git a/src/Resources/public/app.052a1081.rtl.css b/src/Resources/public/app.052a1081.rtl.css