From 5ee84581e72aaa20ec30a7e8351203ac05366b97 Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 19 Nov 2021 12:41:51 +0100
Subject: [PATCH] wip #4895 @0.25

---
 src/app/Magic/Fields/SelectFromArray.php | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/app/Magic/Fields/SelectFromArray.php b/src/app/Magic/Fields/SelectFromArray.php
index 7d05ce0..a7e4dc3 100644
--- a/src/app/Magic/Fields/SelectFromArray.php
+++ b/src/app/Magic/Fields/SelectFromArray.php
@@ -60,9 +60,21 @@ class SelectFromArray extends Field
     {
         $value = parent::filterValue($value);
         $aliases = $this->getAttribute('options_aliases', []);
-        if (isset($aliases[$value])) {
-            $value = $aliases[$value];
+        if (is_array($value)) {
+            $values_aliases = [];
+            foreach ($value as $k => $item) {
+                if (isset($aliases[$item])) {
+                    $item = $aliases[$item];
+                }
+                $values_aliases[$k] = $item;
+                $value = $values_aliases;
+            }
+        } else {
+            if (isset($aliases[$value])) {
+                $value = $aliases[$value];
+            }
         }
+
         return $value;
     }
 
-- 
2.39.5