DataObjects/Core_enum.php

[Pman.Core] / DataObjects / Core_enum.php

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index fe7c3df..af2681d 100644 (file)
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -26,7 +26,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         
 //        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]' ....
@@ -125,16 +125,17 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
     function beforeUpdate($old, $request,$roo)
     {   
         if(!empty($request['_merge_id'])){
-            $this->merge($request['_merge_id']);
+            $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->find(true);
             if($x->count() > 0){
-                $roo->jerr('is exsiting');
+                $roo->jerr('record already exists');
             }
         }
     }
@@ -338,10 +339,8 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         
     }
     
-    function merge($id)
+    function merge($merge_to, $roo)
     {
-        $map = $this->links();
-        
         $affects  = array();
         
         $all_links = $GLOBALS['_DB_DATAOBJECT']['LINKS'][$this->_database];
@@ -356,7 +355,28 @@ 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);
+
+            $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');
         
     }