DataObjects/Core_watch.php

[Pman.Core] / DataObjects / Core_enum.php

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index d70444c..e13f4f2 100644 (file)
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -24,7 +24,7 @@ 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 = ''");
         }
@@ -48,6 +48,42 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
             
         }
         
+//        print_r($this);
+        if(!empty($q['id'])){
+            $this->id = $q['id'];
+        }
+        
+    }
+    
+    function autoJoinCmsTranslate($lang)
+    {
+        $l = $this->escape($lang);
+        
+        $this->_join .= "
+            LEFT JOIN 
+                cms_templatestr 
+            ON
+                cms_templatestr.lang = '$l'
+            AND
+                cms_templatestr.on_table = 'core_enum'
+            AND
+                cms_templatestr.on_id = core_enum.id
+            AND
+                cms_templatestr.on_col = 'display_name'
+        ";
+        
+        $this->selectAdd("
+            CASE WHEN 
+                '$l' = 'en' THEN display_name 
+            ELSE
+                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 
+        ");
+        
     }
     
     function postListFilter($data, $authUser, $q) {
@@ -105,13 +141,13 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
     function onInsert($req)
     {
         $x = $this->factory($this->tableName());
-        $x->query("SELECT core_enum_seqmax_update('". $this->escape($this->etype) ."')");
+        $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());
-        $x->query("SELECT core_enum_seqmax_update('". $this->escape($this->etype) ."')");
+        $x->query("SELECT core_enum_seqmax_update('". $this->escape($this->etype) ."')"); // no idea why need to do this!!??
         if ($old->etype != $this->etype) {
             $x->query("SELECT core_enum_seqmax_update('". $this->escape($old->etype) ."')");
         }
@@ -130,6 +166,13 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         return 0;
     }
     
+    
+    function lookupById($id) {
+        $ce = DB_DataObject::Factory('core_enum');
+        $ce->get($id);
+        return $ce;
+    }
+    
     /**
      * 
      * 
@@ -155,6 +198,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         $x = DB_DataObject::factory('core_enum');
         $x->etype = $etype;
         $x->active = 1;
+        $x->orderBy('seqid ASC');
         return $x->fetchAll($fetchArg1, $fetchArg2, $fetchArg3);
     }
     
@@ -194,7 +238,8 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
     
     function initEnums($data, $base = array())
     {
-        // base only contains etype... 
+        // base only contains etype...
+        //print_r($data);
         $seq_id = 0;
         if (!empty($base['etype'])) {
             $seq_id = 1;
@@ -216,15 +261,14 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
             
             if (empty($t->name)) {
                 print_R($data);
-                die("invalid name used for core_enum");
+                die("ERROR: invalid name used for core_enum\n\n");
             }
             
             if (!$t->count()) {
-                
+                // base already gave it the etype..
                 $t->setFrom($row);
                 
                 
-                
                 //$t->is_system_enum = 1; // this should be on the caller..
                 
                 if (!empty($row['seqid'])) {
@@ -234,6 +278,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
                 
                 $t->insert();
             }else{
+                $t->find(true); // fetch it..
                 if ( isset($row['is_system_enum'])) {
                      $t->is_system_enum = isset($row['is_system_enum']) ? $row['is_system_enum'] : $t->is_system_enum;