Update RelationInput with recent changes to SelectizeInput

locomotivemtl · Aug 28, 2017 · 326f0ea · 326f0ea
1 parent 30f3b35
commit 326f0ea
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 3 deletions.
diff --git a/metadata/charcoal/relation/pivot-interface.json b/metadata/charcoal/relation/pivot-interface.json
@@ -68,9 +68,6 @@
 
             "multiple": false,
 
-            "choice_obj_map": {
-                "label": "title"
-            },
             "selectize_options": {
                 "create": false,
                 "plugins": {

diff --git a/src/Charcoal/Admin/Property/Input/Selectize/RelationInput.php b/src/Charcoal/Admin/Property/Input/Selectize/RelationInput.php
@@ -19,6 +19,13 @@ class RelationInput extends SelectizeInput
      */
     private $targetObjectType;
 
+    /**
+     * Check used to parse multi Choice map against the obj properties.
+     *
+     * @var boolean
+     */
+    protected $isChoiceObjMapFinalized = false;
+
     /**
      * Retrieve the target object type to build the choices from.
      *
@@ -65,4 +72,37 @@ private function resolveTargetObjectType()
 
         return $resolved;
     }
+
+    /**
+     * Retrieve the object-to-choice data map.
+     *
+     * @return array Returns a data map to abide.
+     */
+    public function choiceObjMap()
+    {
+        if ($this->choiceObjMap === null) {
+            $map = $this->defaultChoiceObjMap();
+
+            $model = $this->modelFactory()->get($this->targetObjectType());
+            $objProperties = $model->properties();
+
+            if ($objProperties instanceof \Iterator) {
+                $objProperties = iterator_to_array($objProperties);
+            }
+
+            foreach ($map as &$mapProp) {
+                $props = explode(':', $mapProp);
+                foreach ($props as $p) {
+                    if (isset($objProperties[$p])) {
+                        $mapProp = $p;
+                        break;
+                    }
+                }
+            }
+
+            $this->choiceObjMap = $map;
+        }
+
+        return $this->choiceObjMap;
+    }
 }