DataObjects/Core_enum.php

[Pman.Core] / DataObjects / Core_enum.php

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index ea3c02a..6943a0f 100644 (file)
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -57,6 +57,9 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
                     core_enum.display_name LIKE '%{$name}%'
             ");
         }
+        if (isset($q['_etypes'])) {
+            $this->whereAddIn('core_enu.etype', explode(',', $q['_etypes']), 'string');
+        }
         
     }
     
@@ -130,11 +133,12 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         
         $tn = $this->tableName();
         $x = $this->factory($tn);
-        if(!($old->etype == $request['etype'] && $old->name == $request['name'])){
+        // 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->find(true);
             if($x->count() > 0){
-                $roo->jerr('is exsiting');
+                $roo->jerr('record already exists');
             }
         }
     }
@@ -169,7 +173,8 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         if ($old->etype != $this->etype) {
             $x->query("SELECT core_enum_seqmax_update('". $this->escape($old->etype) ."')");
         }
-        if($this->name != $old->name && empty($old->etype) && empty($this->etype)){
+        
+        if($this->name != $old->name && !empty($old->name) && empty($old->etype) && empty($this->etype)){
             $x->query("UPDATE core_enum SET etype = '". $this->escape($this->name) 
                 ."' WHERE etype = '". $this->escape($old->name)."'");
         }