X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_enum.php;h=97f6a61ae4c80eccde217d82e46581164317099e;hb=95164514241447b76a197711a74d0f4368474e4a;hp=dbee83100bae06bc8c9bc59f288068027a4fc675;hpb=35486b8cfb10928467192e0e06ad61ee0deb59a0;p=Pman.Core

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index dbee8310..97f6a61a 100644
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -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'])) {
             
@@ -199,7 +199,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
             $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']}'"  );
             }
         }
     }
@@ -211,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!!??
@@ -367,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++;
                 }
@@ -375,11 +375,16 @@ 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->update($o);
+                
             }
             if (!empty($row['cn'])) {
                 $this->initEnums($row['cn'], array('etype' => $t->name));