X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_enum.php;h=66e509ca6a18b7c0634c610a42e87a4264191755;hp=d05bf8bfa82512f1897e6be87da087e68795264d;hb=5d4ac076dc4f620fbb91944eead3e0af66216a03;hpb=a10fd9cec60b6ea93ae9a973f0a085c1f5a746b3

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index d05bf8bf..66e509ca 100644
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -1,8 +1,8 @@
 <?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';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_Core_enum extends DB_DataObject 
 {
@@ -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');
         }
@@ -105,7 +115,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
     
     function postListFilter($data, $authUser, $q) {
         
-        if(!empty($q['cmsTab'])){
+       /* if(!empty($q['cmsTab'])){
             $ret = array();
             foreach($data as $k=>$v){
                 if($v['name'] == 'element'){
@@ -119,7 +129,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
             }
             $data = $ret;
         }
-        
+        */
         return $data;
         
     }
@@ -148,15 +158,48 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         $tn = $this->tableName();
         $x = $this->factory($tn);
         
-        if(empty($req['etype'])){
+        if(empty($req['etype']) || !strlen(trim($req['etype'])) ){
+            
+            if (empty($req['name']) || !strlen(trim($req['name']))) {
+                $roo->jerr('name or etype missing');
+            }
+            
             if($x->get('name', $req['name'])){
-                $roo->jerr('name is exsiting');
+                $roo->jerr("name already exists - '{$req['name']}'"  );
             }
-        }else{
+        } 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);
+                $rr = array(
+                    'etype' => $req['etype'],
+                    'name' => array_shift($bits)
+                );
+                
+                $rr['display_name'] = empty($bits) ? $rr['name'] : $bits[0];
+                
+                $x = $this->factory($tn);
+                $x->beforeInsert($rr, $roo);
+                $x->setFrom($rr);
+                $x->insert();
+                
+            }
+            $roo->jok("inserted");
+            
+        } else {
+            if (empty($req['name']) || !strlen(trim($req['name']))) {
+                $roo->jerr('name missing');
+            }
+            
             $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 - '{$req['name']}'"  );
             }
         }
     }
@@ -168,7 +211,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
          
     }
     
-    function onUpdate($old, $req)
+    function onUpdate($old, $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!!??
@@ -324,7 +367,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
                 
                 //$t->is_system_enum = 1; // this should be on the caller..
                 
-                if (!empty($row['seqid'])) {
+                if (!empty($row['seqid']) && !is_numeric($row['seqid'])) {
                     $t->seqid = $seq_id;
                     $seq_id++;
                 }
@@ -332,11 +375,18 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
                 $t->insert();
             }else{
                 $t->find(true); // fetch it..
+                $o = clone($t);
+                
                 if ( isset($row['is_system_enum'])) {
                      $t->is_system_enum = isset($row['is_system_enum']) ? $row['is_system_enum'] : $t->is_system_enum;
-                    
-                    $t->update();
                 }
+                
+                $t->display_name = isset($row['display_name']) ? $row['display_name'] : $t->display_name;
+                
+                $t->seqid = isset($row['seqid']) ? $row['seqid'] : $t->seqid;
+                
+                $t->update($o);
+                
             }
             if (!empty($row['cn'])) {
                 $this->initEnums($row['cn'], array('etype' => $t->name));