DataObjects/Core_watch.php

[Pman.Core] / DataObjects / Core_enum.php

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index aa9b70a..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,15 +48,41 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
             
         }
         
+//        print_r($this);
+        if(!empty($q['id'])){
+            $this->id = $q['id'];
+        }
+        
     }
     
-    function autoJoinCmsTranslate()
+    function autoJoinCmsTranslate($lang)
     {
-        $this->join .= "
-            LEFT JOIN cms_templatestr ON 
-                
+        $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 
+        ");
         
     }