X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_enum.php;h=d05bf8bfa82512f1897e6be87da087e68795264d;hp=71c340988aa7eb755d357a50545eb9a2d2ae4535;hb=a10fd9cec60b6ea93ae9a973f0a085c1f5a746b3;hpb=30a6fc443f4a8c9f2e2eae1b920deec3463e31ec

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index 71c34098..d05bf8bf 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');
+        }
         
     }
     
@@ -125,16 +128,18 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
     function beforeUpdate($old, $request,$roo)
     {   
         if(!empty($request['_merge_id'])){
-            print_R($request);exit;
+            $this->merge($request['_merge_id'], $roo);
         }
         
         $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');
             }
         }
     }
@@ -156,12 +161,13 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         }
     }
     
-    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 +175,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,5 +345,46 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         
     }
     
+    function merge($merge_to, $roo)
+    {
+        $affects  = array();
+        
+        $all_links = $GLOBALS['_DB_DATAOBJECT']['LINKS'][$this->_database];
+        
+        foreach($all_links as $tbl => $links) {
+            foreach($links as $col => $totbl_col) {
+                $to = explode(':', $totbl_col);
+                if ($to[0] != $this->tableName()) {
+                    continue;
+                }
+                
+                $affects[$tbl .'.' . $col] = true;
+            }
+        }
+        
+        foreach($affects as $k => $true) {
+            $ka = explode('.', $k);
+
+            $chk = DB_DataObject::factory($ka[0]);
+            
+            if (!is_a($chk,'DB_DataObject')) {
+                $roo->jerr('Unable to load referenced table, check the links config: ' .$ka[0]);
+            }
+            
+            $chk->{$ka[1]} = $this->id;
+
+            foreach ($chk->fetchAll() as $c){
+                $cc = clone ($c);
+                $c->{$ka[1]} = $merge_to;
+                $c->update($cc);
+            }
+        }
+        
+        $this->delete();
+        
+        $roo->jok('Merged');
+        
+    }
+    
     
 }