X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_enum.php;h=ea3c02a7d758903f5b189bc0e98bc0dce146efae;hb=4de286975b738fcc7a5c14079f4b7d5148111871;hp=c50b31f90b38344bb4bf9890db5f962c883052b8;hpb=df6e089e47e45b884d93fafad1d90f81b458ed99;p=Pman.Core

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index c50b31f9..ea3c02a7 100644
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -24,9 +24,9 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
     function applyFilters($q, $au)
     {
         
-        //DB_DataObject::debugLevel(1);
+//        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]' ....
@@ -48,13 +48,32 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
             
         }
         
+        if(!empty($q['query']['search'])) {
+            $name = $this->escape($q['query']['search']);
+            // ilike on postgres?!?
+            $this->whereAdd("
+                    core_enum.name LIKE '%{$name}%'
+                OR
+                    core_enum.display_name LIKE '%{$name}%'
+            ");
+        }
+        
+    }
+    
+    function checkPerm($lvl, $au, $req=null)
+    {
+        if (!$au) {
+            return false;
+        }
+        return true;
     }
     
+    
     function autoJoinCmsTranslate($lang)
     {
         $l = $this->escape($lang);
         
-        $this->join .= "
+        $this->_join .= "
             LEFT JOIN 
                 cms_templatestr 
             ON
@@ -71,7 +90,11 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
             CASE WHEN 
                 '$l' = 'en' THEN display_name 
             ELSE
-                cms_templatestr.txt
+                CASE WHEN cms_templatestr.txt IS NOT NULL AND cms_templatestr.txt != '' THEN
+                    cms_templatestr.txt
+                ELSE
+                    display_name
+                END
             END as  display_name_tr 
         ");
         
@@ -100,11 +123,15 @@ 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'])){
-            $x->whereAdd("etype = '{$request['etype']}' AND 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');
@@ -121,7 +148,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
                 $roo->jerr('name is exsiting');
             }
         }else{
-            $x->whereAdd("etype = '{$req['etype']}' AND name = '{$req['name']}'");
+            $x->whereAdd("etype = '{$this->escape($req['etype'])}' AND name = '{$this->escape($req['name'])}'");
             $x->find(true);
             if($x->count() > 0){
                 $roo->jerr('is exsiting');
@@ -142,6 +169,10 @@ 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)){
+            $x->query("UPDATE core_enum SET etype = '". $this->escape($this->name) 
+                ."' WHERE etype = '". $this->escape($old->name)."'");
+        }
     }
     
     /**
@@ -157,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');
@@ -173,10 +228,10 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
      * @return array ID of core_enum 
      */
     
-    function lookupAllByName($etype,$name) {
+    function lookupAllByName($etype,$names) {
         $ce = DB_DataObject::Factory('core_enum');
         $ce->etype = $etype;
-        $ce->whereAddIn('name', $name, 'string');
+        $ce->whereAddIn('name', $names, 'string');
         
         if ($ce->count() > 0) {
             return $ce->fetchAll('id');
@@ -283,5 +338,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');
+        
+    }
+    
     
 }