DataObjects/Core_person_signup.php

[Pman.Core] / DataObjects / Core_enum.php

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index 2c90551..458f015 100644 (file)
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -48,6 +48,16 @@ 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}%'
+            ");
+        }
+        
 //        print_r($this);
         if(!empty($q['id'])){
             $this->id = $q['id'];
@@ -76,7 +86,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
             CASE WHEN 
                 '$l' = 'en' THEN display_name 
             ELSE
-                CASE WHEN cms_templatestr.txt IS NOT NULL OR cms_templatestr.txt != '' THEN
+                CASE WHEN cms_templatestr.txt IS NOT NULL AND cms_templatestr.txt != '' THEN
                     cms_templatestr.txt
                 ELSE
                     display_name
@@ -182,10 +192,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');