Improve support for BackedEnums

wintercms · Sep 3, 2023 · 32f25ef · 32f25ef
1 parent ca85e3c
commit 32f25ef
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/modules/backend/classes/FormField.php b/modules/backend/classes/FormField.php
@@ -700,25 +700,26 @@ protected function getFieldNameFromData($fieldName, $data, $default = null)
             if ($result instanceof Model && $result->hasRelation($key)) {
                 if ($key == $lastField) {
                     $result = $result->getRelationValue($key) ?: $default;
-                }
-                else {
+                } else {
                     $result = $result->{$key};
                 }
-            }
-            elseif (is_array($result)) {
+            } elseif (is_array($result)) {
                 if (!array_key_exists($key, $result)) {
                     return $default;
                 }
                 $result = $result[$key];
-            }
-            else {
+            } else {
                 if (!isset($result->{$key})) {
                     return $default;
                 }
                 $result = $result->{$key};
             }
         }
 
+        if ($result instanceof BackedEnum) {
+            $result = $result->value;
+        }
+
         return $result;
     }
 }