X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FI18n.php;h=ce1619ad523467b7712713a8ad4402af2a6d86f6;hb=27a1a32abdd80b79b936003238709950f0e3ba29;hp=971d0d6e10c54f410cd9bf6bb039ba3d2478a0cc;hpb=8bd666948e00b5a62992fc9ff7a3281183de0e34;p=Pman.Core

diff --git a/DataObjects/I18n.php b/DataObjects/I18n.php
index 971d0d6e..ce1619ad 100644
--- a/DataObjects/I18n.php
+++ b/DataObjects/I18n.php
@@ -127,10 +127,24 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
             $this->buildDB(); // ensure we have the full database...
             
             $this->selectAdd("
+                id as id,
                 i18n_translate(ltype, lkey, 'en') as lval_en
-                
             ");
         }
+        
+        if (!empty($q['_as_code_and_title'])) {
+            $tn = $this->tableName();
+            
+            $this->selectAdd();
+            $this->selectAdd("
+                    {$tn}.lval as title,
+                    {$tn}.lkey as code
+            ");
+            $this->is_active = 1;
+            if (!empty($q['_title'])) {
+                $this->whereAdd("{$tn}.lval like '{$this->escape($_REQUEST['_title'])}%'");
+            }
+        }
          
         if (!empty($q['!code'])) {
             $this->whereAddIn('!lkey', explode(',', $q['!code']), 'string'); 
@@ -141,6 +155,10 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
             $this->whereAdd("upper(lval) LIKE '%{$v}%'");
         }
         
+         if (!empty($q['query']['name_starts'])) {
+            $this->whereAdd("lval LIKE '". $this->escape($q['query']['name_starts']). "%'");
+        }
+        
         if (!empty($q['_filtered']) && !empty($this->ltype)) {
             $cfg = $this->cfg();
             $filter = $cfg[$this->ltype];
@@ -228,7 +246,7 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
     function toTransList($ltype, $inlang)
     {
         
-        
+        $this->is_active = 1;
         $this->ltype = $ltype;
         $this->inlang= $inlang;
         $this->selectAdd();