X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_enum.php;h=062041f0c16f994d835b40b8699f24531ef2d0cf;hb=7790a37ecaf891c820200ba32c26e2cf56cb55e6;hp=f39189c59e59ec2520ef502b44a6335afff6a258;hpb=4a9ffd7d54ba7a1db1e4443f3ba851ac3780aa08;p=Pman.Core

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index f39189c5..062041f0 100644
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Table Definition for core company
+ * Table Definition for core enum - it's used in pulldowns or simple option lists.
  */
 require_once 'DB/DataObject.php';
 
@@ -21,12 +21,12 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
     
-    function applyFilters($q, $au)
+    function applyFilters($q, $au, $roo)
     {
         
 //        DB_DataObject::debugLevel(1);
         if (!empty($q['query']['empty_etype'])) {
-            $this->whereAdd("etype = ''");
+            $this->whereAdd("core_enum.etype = ''");
         }
         
         // this should be handled by roo... using '!name[0]' ....
@@ -57,6 +57,19 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
                     core_enum.display_name LIKE '%{$name}%'
             ");
         }
+        if(!empty($q['query']['search_begins'])) {
+            $name = $this->escape($q['query']['search_begins']);
+            // ilike on postgres?!?
+            $this->whereAdd("
+                    core_enum.name LIKE '{$name}%'
+                OR
+                    core_enum.display_name LIKE '{$name}%'
+            ");
+        }
+        
+        if (isset($q['_etypes'])) {
+            $this->whereAddIn('core_enum.etype', explode(',', $q['_etypes']), 'string');
+        }
         
     }
     
@@ -130,11 +143,13 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         
         $tn = $this->tableName();
         $x = $this->factory($tn);
-        if(!($old->etype == $request['etype'] && $old->name == $request['name'])){
+        // check if record exists?
+        if(isset($request['etype']) &&   !($old->etype == $request['etype'] && $old->name == $request['name'])){
             $x->whereAdd("etype = '{$this->escape($request['etype'])}' AND name = '{$this->escape($request['name'])}'");
+            $x->whereAdd("id != ".((int) $this->id));
             $x->find(true);
             if($x->count() > 0){
-                $roo->jerr('is exsiting');
+                $roo->jerr('a duplicate record already exists');
             }
         }
     }
@@ -145,23 +160,24 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         
         if(empty($req['etype'])){
             if($x->get('name', $req['name'])){
-                $roo->jerr('name is exsiting');
+                $roo->jerr('name already exists');
             }
         }else{
             $x->whereAdd("etype = '{$this->escape($req['etype'])}' AND name = '{$this->escape($req['name'])}'");
             $x->find(true);
             if($x->count() > 0){
-                $roo->jerr('is exsiting');
+                $roo->jerr('name already exists');
             }
         }
     }
     
-    function onInsert($req)
+    function onInsert($req, $roo)
     {
         $x = $this->factory($this->tableName());
         $x->query("SELECT core_enum_seqmax_update('". $this->escape($this->etype) ."')"); // no idea why need to do this!!??
          
     }
+    
     function onUpdate($old, $req)
     {
         $x = $this->factory($this->tableName());
@@ -169,7 +185,8 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         if ($old->etype != $this->etype) {
             $x->query("SELECT core_enum_seqmax_update('". $this->escape($old->etype) ."')");
         }
-        if($this->name != $old->name && empty($old->etype) && empty($this->etype)){
+        
+        if($this->name != $old->name && !empty($old->name) && empty($old->etype) && empty($this->etype)){
             $x->query("UPDATE core_enum SET etype = '". $this->escape($this->name) 
                 ."' WHERE etype = '". $this->escape($old->name)."'");
         }
@@ -338,7 +355,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         
     }
     
-    function merge($to, $roo)
+    function merge($merge_to, $roo)
     {
         $affects  = array();
         
@@ -354,7 +371,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
                 $affects[$tbl .'.' . $col] = true;
             }
         }
-        print_R($affects);exit;
+        
         foreach($affects as $k => $true) {
             $ka = explode('.', $k);
 
@@ -368,7 +385,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
 
             foreach ($chk->fetchAll() as $c){
                 $cc = clone ($c);
-                $c->{$ka[1]} = $to;
+                $c->{$ka[1]} = $merge_to;
                 $c->update($cc);
             }
         }