X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_enum.php;h=e6fa6c9b5d98790476ab122646aac3264b752b5d;hb=0520bc0da4b2cf273cab85946bfb8829ad4ddb2f;hp=8ca0f2268db94adc25b64ddcd318a131f7c47b7d;hpb=0c569130f663c38416da01d95c09438be5e5a433;p=Pman.Core

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index 8ca0f226..e6fa6c9b 100644
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.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,9 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
                     core_enum.display_name LIKE '%{$name}%'
             ");
         }
+        if (isset($q['_etypes'])) {
+            $this->whereAddIn('core_enum.etype', explode(',', $q['_etypes']), 'string');
+        }
         
     }
     
@@ -130,11 +133,12 @@ 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->find(true);
             if($x->count() > 0){
-                $roo->jerr('is exsiting');
+                $roo->jerr('record already exists');
             }
         }
     }
@@ -169,7 +173,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 +343,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         
     }
     
-    function merge($id, $roo)
+    function merge($merge_to, $roo)
     {
         $affects  = array();
         
@@ -361,25 +366,22 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
             $chk = DB_DataObject::factory($ka[0]);
             
             if (!is_a($chk,'DB_DataObject')) {
-                $this->jerr('Unable to load referenced table, check the links config: ' .$ka[0]);
+                $roo->jerr('Unable to load referenced table, check the links config: ' .$ka[0]);
             }
-           // print_r(array($chk->tablename() , $ka[1] ,  $xx->tablename() , $this->key ));
-            $chk->{$ka[1]} =  $xx->{$this->key};
+            
+            $chk->{$ka[1]} = $this->id;
 
-            if (count($chk->keys())) {
-                $matches = $chk->count();
-            } else {
-                //DB_DataObject::DebugLevel(1);
-                $matches = $chk->count($ka[1]);
+            foreach ($chk->fetchAll() as $c){
+                $cc = clone ($c);
+                $c->{$ka[1]} = $merge_to;
+                $c->update($cc);
             }
-
-            if ($matches) {
-                $chk->_match_key = $ka[1];
-                $match_ar[] = clone($chk);
-                continue;
-            }          
         }
         
+        $this->delete();
+        
+        $roo->jok('Merged');
+        
     }