check primary-key-field, if other than id in default-processors: getl…

…ist and fields Signed-off-by: Bruno Perner <b.perner@gmx.de>
Bruno17 · Sep 14, 2012 · ad259f0 · ad259f0
1 parent 4194c88
commit ad259f0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/core/components/migx/model/migx/migx.class.php b/core/components/migx/model/migx/migx.class.php
@@ -1069,16 +1069,19 @@ function extractInputTvs($formtabs) {
         $inputTvs = array();
         if (is_array($formtabs)) {
             foreach ($formtabs as $tab) {
-                $fields = is_array($tab['fields']) ? $tab['fields'] : $this->modx->fromJson($tab['fields']);
-                if (isset($tab['fields']) && is_array($fields)) {
-                    foreach ($fields as $field) {
-                        if (isset($field['inputTV']) && !empty($field['inputTV'])) {
-                            $inputTvs[$field['field']] = $field;
-                        } elseif (isset($field['inputTVtype']) && !empty($field['inputTVtype'])) {
-                            $inputTvs[$field['field']] = $field;
+                if (isset($tab['fields'])) {
+                    $fields = is_array($tab['fields']) ? $tab['fields'] : $this->modx->fromJson($tab['fields']);
+                    if (is_array($fields)) {
+                        foreach ($fields as $field) {
+                            if (isset($field['inputTV']) && !empty($field['inputTV'])) {
+                                $inputTvs[$field['field']] = $field;
+                            } elseif (isset($field['inputTVtype']) && !empty($field['inputTVtype'])) {
+                                $inputTvs[$field['field']] = $field;
+                            }
                         }
                     }
                 }
+
             }
         }
         return $inputTvs;

diff --git a/core/components/migx/processors/mgr/default/fields.php b/core/components/migx/processors/mgr/default/fields.php
@@ -34,9 +34,10 @@
     $object->set('object_id', 'new');
 } else {
     $c = $modx->newQuery($classname, $scriptProperties['object_id']);
+    $pk = $modx->getPK($classname);
     $c->select('
         `' . $classname . '`.*,
-    	`' . $classname . '`.`id` AS `object_id`
+    	`' . $classname . '`.`'.$pk.'` AS `object_id`
     ');
     if (!empty($joinalias)) {
         $c->leftjoin($joinclass, $joinalias);

diff --git a/core/components/migx/processors/mgr/default/getlist.php b/core/components/migx/processors/mgr/default/getlist.php
@@ -148,8 +148,10 @@
 //$c->prepare();echo $c->toSql();
 $rows = array();
 if ($collection = $modx->getCollection($classname, $c)) {
+    $pk = $modx->getPK($classname);
     foreach ($collection as $object) {
         $row = $object->toArray();
+        $row['id'] = !isset($row['id']) ? $row[$pk] : $row['id'];
         $rows[] = $row;
     }
 }