X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_enum.php;h=4475312ab7d12e5fdeed5f287cc839fc3f715ff7;hb=0bc2a46a50ad3b2f5fda48836e94be8f1ac5bdb1;hp=1cda73c395937633d359dfa9a3303f54de89d29c;hpb=eabe74d75ddc055ddcc094c618f15b70369e16fb;p=Pman.Core diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php index 1cda73c3..4475312a 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('a duplicaeterecord already exists'); + $roo->jerr('a duplicate record already exists'); } } } @@ -154,18 +155,20 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject }else{ $x->whereAdd("etype = '{$this->escape($req['etype'])}' AND name = '{$this->escape($req['name'])}'"); $x->find(true); + print_R($x->count());exit; if($x->count() > 0){ $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());