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

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index 1a91d40e..66e509ca 100644
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -2,7 +2,7 @@
 /**
  * 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 
 {
@@ -115,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'){
@@ -129,7 +129,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
             }
             $data = $ret;
         }
-        
+        */
         return $data;
         
     }
@@ -165,7 +165,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
             }
             
             if($x->get('name', $req['name'])){
-                $roo->jerr('name already exists');
+                $roo->jerr("name already exists - '{$req['name']}'"  );
             }
         } else if (!empty($req['_bulk_names'])) {
             
@@ -192,10 +192,14 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
             $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('name already exists');
+                $roo->jerr("name already exists - '{$req['name']}'"  );
             }
         }
     }
@@ -207,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!!??
@@ -363,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++;
                 }
@@ -371,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));