X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_enum.php;h=3a3b6e2ebcf92a95bf414e0a208a30e86e8d381b;hb=61887df56e50a9a4b2c0a50677f06151e827d557;hp=30d9a98a47b7c2628d4808eaaab39a3b9367e679;hpb=d52eb395f81f3892e28689499c5db1e6a155ed9c;p=Pman.Core

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index 30d9a98a..3a3b6e2e 100644
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -58,17 +58,17 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
             ");
         }
         
-//        print_r($this);
-        if(!empty($q['id'])){ // this should never be needed?!?!?!?!??
-            $this->id = $q['id'];
-        }
-        
-        if(!empty($q['ids'])){
-            $this->whereAddIn('core_enum.id', explode(',',  $q['ids']) , 'int');
+    }
+    
+    function checkPerm($lvl, $au, $req=null)
+    {
+        if (!$au) {
+            return false;
         }
-        
+        return true;
     }
     
+    
     function autoJoinCmsTranslate($lang)
     {
         $l = $this->escape($lang);
@@ -124,6 +124,10 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
     
     function beforeUpdate($old, $request,$roo)
     {   
+        if(!empty($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'])){
@@ -184,6 +188,30 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         return 0;
     }
     
+    function lookupCreate($etype,$name, $display_name=false) {
+        
+        // check
+        $ce = DB_DataObject::Factory('core_enum');
+        $ce->setFrom(array(
+            'etype' => '',
+            'name' => $etype
+        ));
+        if (!$ce->find(true)) {
+            $ce->display_name = $etype;
+            $ce->insert();
+        }
+        
+        $ce = DB_DataObject::Factory('core_enum');
+        $ce->etype = $etype;
+        $ce->name = $name;
+        if ($ce->find(true)) {
+            return $ce->id;
+        }
+        $ce->active = 1;
+        $ce->display_name = $display_name === false ? $ce->name : $display_name;
+        return  $ce->insert();
+        
+    }
     
     function lookupById($id) {
         $ce = DB_DataObject::Factory('core_enum');
@@ -310,5 +338,46 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         
     }
     
+    function 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]} = $to;
+                $c->update($cc);
+            }
+        }
+        
+        $this->delete();
+        
+        $roo->jok('Merged');
+        
+    }
+    
     
 }