ImportSource: use target_property for transforms

application/tables/ImportsourceHookTable.php

@@ -21,7 +21,12 @@ class ImportsourceHookTable extends QuickTable
     public function getColumns()
     {
         if ($this->columnCache === null) {
-            $this->columnCache = $this->sourceHook()->listColumns();
+            $this->columnCache = array_merge(
+                $this->sourceHook()->listColumns(),
+                $this->source->listModifierTargetProperties()
+            );
+
+            sort($this->columnCache);
         }
 
         return $this->columnCache;

library/Director/Hook/PropertyModifierHook.php

@@ -39,8 +39,12 @@ abstract class PropertyModifierHook
         return $this->targetProperty !== null;
     }
 
-    public function getTargetProperty()
+    public function getTargetProperty($default = null)
     {
+        if ($this->targetProperty === null) {
+            return $default;
+        }
+
         return $this->targetProperty;
     }
 

library/Director/Objects/ImportSource.php

@@ -99,12 +99,17 @@ class ImportSource extends DbObjectWithSettings
                 if (! property_exists($row, $key)) {
                     continue;
                 }
+
+                $target = $mod->getTargetProperty($key);
+
                 if (is_array($row->$key)) {
-                    foreach ($row->$key as & $k) {
+                    $new = array();
-                        $k = $mod->transform($k);
+                    foreach ($row->$key as $k => $v) {
+                        $new[$k] = $mod->transform($v);
                     }
+                    $row->$target = $new;
                 } else {
-                    $row->$key = $mod->transform($row->$key);
+                    $row->$target = $mod->transform($row->$key);
                 }
             }
         }
@@ -153,6 +158,20 @@ class ImportSource extends DbObjectWithSettings
         $this->rowModifiers = $modifiers;
     }
 
+    public function listModifierTargetProperties()
+    {
+        $list = array();
+        foreach ($this->getRowModifiers() as $rowMods) {
+            foreach ($rowMods as $mod) {
+                if ($mod->hasTargetProperty()) {
+                    $list[$mod->getTargetProperty()] = true;
+                }
+            }
+        }
+
+        return array_keys($list);
+    }
+
     public function checkForChanges($runImport = false)
     {
         $hadChanges = false;