X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_enum.php;h=38c0b9e731bfbbff5e9f603d265c9eb7ec1f64d6;hb=6e7afd5b0e0e08e31873f9e42faa3951a2c2f2d7;hp=6943a0ff7ea14150382df52f4f14990563640497;hpb=e8138336a5eaa7e9094a827339f2760e3277e7cd;p=Pman.Core

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index 6943a0ff..38c0b9e7 100644
--- 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';
 
@@ -21,7 +21,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
     
-    function applyFilters($q, $au)
+    function applyFilters($q, $au, $roo)
     {
         
 //        DB_DataObject::debugLevel(1);
@@ -57,8 +57,18 @@ 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_enu.etype', explode(',', $q['_etypes']), 'string');
+            $this->whereAddIn('core_enum.etype', explode(',', $q['_etypes']), 'string');
         }
         
     }
@@ -136,9 +146,10 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         // check if record exists?
         if(isset($request['etype']) &&   !($old->etype == $request['etype'] && $old->name == $request['name'])){
             $x->whereAdd("etype = '{$this->escape($request['etype'])}' AND name = '{$this->escape($request['name'])}'");
+            $x->whereAdd("id != ".((int) $this->id));
             $x->find(true);
             if($x->count() > 0){
-                $roo->jerr('record already exists');
+                $roo->jerr('a duplicate record already exists');
             }
         }
     }
@@ -148,24 +159,50 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         $x = $this->factory($tn);
         
         if(empty($req['etype'])){
+            if (empty($req['name'])) {
+                $roo->jerr('name or etype missing');
+            }
             if($x->get('name', $req['name'])){
-                $roo->jerr('name is exsiting');
+                $roo->jerr('name already exists');
+            }
+        } else if (!empty($req['_bulk_names'])) {
+            
+            $lines = explode("\n", $req['_bulk_names']);
+            foreach($lines as $l) {
+                $l = trim($l);
+                if (!strlen($l)) {
+                    continue;
+                }
+                $bits = explode(',', $l);
+                $x = $this->factory($tn);
+                $rr = array(
+                    'etype' => $req['etype'],
+                    'name' => array_shift($bits)
+                );
+                
+                $rr['display_name'] = empty($bits) ? $rr['name'] : $bits[0];
+                
+                
+                
             }
-        }else{
+            
+            
+        } else {
             $x->whereAdd("etype = '{$this->escape($req['etype'])}' AND name = '{$this->escape($req['name'])}'");
             $x->find(true);
             if($x->count() > 0){
-                $roo->jerr('is exsiting');
+                $roo->jerr('name already exists');
             }
         }
     }
     
-    function onInsert($req)
+    function onInsert($req, $roo)
     {
         $x = $this->factory($this->tableName());
         $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());