X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_enum.php;h=bb129bb00b40ac661eb8ddd545f56867c4ead8e8;hb=5c4a5e6295a06d5ae65a8297275f630ab0a93ce1;hp=e6fa6c9b5d98790476ab122646aac3264b752b5d;hpb=0520bc0da4b2cf273cab85946bfb8829ad4ddb2f;p=Pman.Core

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index e6fa6c9b..bb129bb0 100644
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -136,9 +136,10 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         // 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->whereAdd("id != ".((int) $this->id));
             $x->find(true);
             if($x->count() > 0){
-                $roo->jerr('record already exists');
+                $roo->jerr('a duplicate record already exists');
             }
         }
     }
@@ -146,7 +147,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
     {
         $tn = $this->tableName();
         $x = $this->factory($tn);
-        
+        DB_DataObject::debugLevel(1);
         if(empty($req['etype'])){
             if($x->get('name', $req['name'])){
                 $roo->jerr('name is exsiting');
@@ -155,17 +156,19 @@ 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('is exsiting');
+                pritn_R($x);exit;
+                $roo->jerr('is exsiting??');
             }
         }
     }
     
-    function onInsert($req)
+    function onInsert($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!!??
          
     }
+    
     function onUpdate($old, $req)
     {
         $x = $this->factory($this->tableName());