DataObjects/Core_enum.php

[Pman.Core] / DataObjects / Core_enum.php

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index 5e8c7b5..062041f 100644 (file)
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Table Definition for core company
+ * Table Definition for core enum - it's used in pulldowns or simple option lists.
  */
 require_once 'DB/DataObject.php';
 
@@ -57,6 +57,16 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
                     core_enum.display_name LIKE '%{$name}%'
             ");
         }
+        if(!empty($q['query']['search_begins'])) {
+            $name = $this->escape($q['query']['search_begins']);
+            // ilike on postgres?!?
+            $this->whereAdd("
+                    core_enum.name LIKE '{$name}%'
+                OR
+                    core_enum.display_name LIKE '{$name}%'
+            ");
+        }
+        
         if (isset($q['_etypes'])) {
             $this->whereAddIn('core_enum.etype', explode(',', $q['_etypes']), 'string');
         }
@@ -150,14 +160,13 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         
         if(empty($req['etype'])){
             if($x->get('name', $req['name'])){
-                $roo->jerr('name is exsiting');
+                $roo->jerr('name already exists');
             }
         }else{
             $x->whereAdd("etype = '{$this->escape($req['etype'])}' AND name = '{$this->escape($req['name'])}'");
-            
+            $x->find(true);
             if($x->count() > 0){
-                print_R($x->fetchAll());exit;
-                $roo->jerr('is exsiting');
+                $roo->jerr('name already exists');
             }
         }
     }