X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_enum.php;h=a421294db1eec81ade5dcd49aac9fc28eb42dd41;hb=3921c019dd6bdc70ba1d9d866fc5537cd5d47e7f;hp=2aa09da8b3c2e14b1f3af20e77d66c631f15f582;hpb=37aea5ef9ad98e9e14d2cfe55a9a93d61c7e77ea;p=Pman.Core diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php index 2aa09da8..a421294d 100644 --- a/DataObjects/Core_enum.php +++ b/DataObjects/Core_enum.php @@ -21,7 +21,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE - function applyFilters($q, $au) + function applyFilters($q, $au, $roo) { // DB_DataObject::debugLevel(1); @@ -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'); } } }