DataObjects/core.sql

[Pman.Core] / DataObjects / Core_enum.php

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index d1381b8..cfd1771 100644 (file)
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -39,6 +39,27 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         }
     }
     
+    function postListFilter($data, $authUser, $q) {
+        
+        if(!empty($q['cmsTab'])){
+            $ret = array();
+            foreach($data as $k=>$v){
+                if($v['name'] == 'element'){
+                    continue;
+                }
+                $ary = $v;
+                if($ary['name'] == 'page'){
+                    $ary['display_name'] = $v['display_name'].' / Elements';
+                }
+                $ret[] = $ary;
+            }
+            $data = $ret;
+        }
+        
+        return $data;
+        
+    }
+    
     function onUpdate($old, $req)
     {
         $x = $this->factory($this->tableName());
@@ -95,6 +116,14 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         
     }
     
+    function fetchAllByType($etype, $fetchArg1=false, $fetchArg2=false, $fetchArg3=false)
+    {
+        $x = DB_DataObject::factory('core_enum');
+        $x->etype = $etype;
+        $x->active = 1;
+        return $x->fetchAll($fetchArg1, $fetchArg2, $fetchArg3);
+    }
+    
     function lookupObject($etype,$name, $create= false)
     {
         
@@ -153,13 +182,10 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         
     }
     
-    function initEnums($data = false, $base = array())
+    function initEnums($data, $base = array())
     {
         
-        if ($data === false) {
-            $this->initEnums($this->baseEnums());
-            return;
-        }
+         
         $seq_id = 0;
         if (!empty($base['etype'])) {
             $seq_id = 1;
@@ -176,8 +202,15 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
             
             $t->setFrom($row);
             $t->setFrom($base);
+            unset($t->seqid); // these might have been changed
+            unset($t->display_name); // these might have been changed
+            
+            
+            if (!$t->find(true))
+            {
+                $t->setFrom($row);
+                $t->setFrom($base);
             
-            if (!$t->find(true)) {
                 if (!empty($base['etype']) && empty($row['seqid'])) {
                     $t->seqid = $seq_id;
                     $seq_id++;