X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_enum.php;h=d05bf8bfa82512f1897e6be87da087e68795264d;hb=40d751c681e519336ff32d0e8fd35cdd05249817;hp=e6fa6c9b5d98790476ab122646aac3264b752b5d;hpb=0520bc0da4b2cf273cab85946bfb8829ad4ddb2f;p=Pman.Core diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php index e6fa6c9b..d05bf8bf 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'); } } } @@ -160,12 +161,13 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject } } - 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());