DataObjects/Core_notify.php

[Pman.Core] / DataObjects / Core_enum.php

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index 636d0a4..6a42840 100644 (file)
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -29,14 +29,46 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
             $this->whereAdd("etype = ''");
         }
         
+        // this should be handled by roo... using '!name[0]' ....
         if(!empty($q['!name'])){
-            $names = explode(',', $q['!name']);
+            $names = is_array($q['!name']) ? $q['!name'] : explode(',', $q['!name']);
             foreach($names as $name){
+                $name  = $this->escape($name);
                 $this->whereAdd("
                     core_enum.name NOT IN ('$name')
                 ");
             }
         }
+        if(!empty($q['search']['display_name'])) {
+            $name = $this->escape($q['search']['display_name']);
+            // ilike on postgres?!?
+            $this->whereAdd("
+                core_enum.display_name LIKE '{$name}%'
+            ");
+            
+        }
+        
+    }
+    
+    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)
@@ -92,7 +124,34 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
             return $ce->id;
         }
         return 0;
+    }
+    
+    /**
+     * 
+     * 
+     * 
+     * @param string $etype
+     * @param array $name array of name
+     * @return array ID of core_enum 
+     */
+    
+    function lookupAllByName($etype,$name) {
+        $ce = DB_DataObject::Factory('core_enum');
+        $ce->etype = $etype;
+        $ce->whereAddIn('name', $name, 'string');
         
+        if ($ce->count() > 0) {
+            return $ce->fetchAll('id');
+        }
+        return array();
+    }
+    
+    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)
@@ -122,40 +181,10 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         return false;
         
     }
-    /**
-     * The base enums that the system always needs,
-     * If we need to add modular enums, then this can be extended, and the two
-     * base data applied.
-     *
-     * This might be moved to an external file later? - eg json...
-     *
-     */
-    function baseEnums()
-    {
-        //
-        return array(
-            array(
-                'etype' => '',
-                'name' => 'COMPTYPE',
-                'display_name' =>  'Company Types',
-                'cn' => array(
-                    array(
-                        'name' => 'OWNER',
-                        'display_name' => 'Owner',
-                        'seqid' => 999, // last...
-                    )
-                    
-                )
-            )
-        );  
-        
-        
-        
-    }
+     
     
     function initEnums($data, $base = array())
     {
-        
          
         $seq_id = 0;
         if (!empty($base['etype'])) {
@@ -173,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++;