X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_enum.php;h=cb5c35c4744b74d41db9e60a6ff6e7c7e746917a;hp=d05d58a2cf82cbdbf01fd77523be4c0192420374;hb=c9511969f698512582ba26f979beae2a802c578c;hpb=ad317d57db2e59c2e22c9afe115325755d9d1593

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index d05d58a2..cb5c35c4 100644
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -158,12 +158,14 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         $tn = $this->tableName();
         $x = $this->factory($tn);
         
-        if(empty($req['etype'])){
-            if (empty($req['name']) || !strlen(trim($req['name'])) {
+        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 already exists');
+                $roo->jerr("name already exists - '{$req['name']}'"  );
             }
         } else if (!empty($req['_bulk_names'])) {
             
@@ -190,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']}'"  );
             }
         }
     }
@@ -205,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!!??
@@ -348,7 +354,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
             $t->etype = isset($base['etype']) ? $base['etype'] : $t->etype ;
             
             $t->name = isset($row['name']) ? $row['name'] : '';
-            
+            print_R($row);exit;
             if (empty($t->name)) {
                 print_R($data);
                 die("ERROR: invalid name used for core_enum\n\n");
@@ -361,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++;
                 }
@@ -369,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));