X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_enum.php;h=062041f0c16f994d835b40b8699f24531ef2d0cf;hb=7790a37ecaf891c820200ba32c26e2cf56cb55e6;hp=d065f84927d05f3e22d6c8ec9a223137f8ce341c;hpb=c186b9fe52c6fe085d91703240a85e7a7dcc8034;p=Pman.Core diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php index d065f849..062041f0 100644 --- a/DataObjects/Core_enum.php +++ b/DataObjects/Core_enum.php @@ -1,6 +1,6 @@ escape($q['query']['search_begins']); + // ilike on postgres?!? + $this->whereAdd(" + core_enum.name LIKE '{$name}%' + OR + core_enum.display_name LIKE '{$name}%' + "); + } + if (isset($q['_etypes'])) { $this->whereAddIn('core_enum.etype', explode(',', $q['_etypes']), 'string'); } @@ -150,13 +160,13 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject if(empty($req['etype'])){ if($x->get('name', $req['name'])){ - $roo->jerr('name is exsiting'); + $roo->jerr('name already exists'); } }else{ $x->whereAdd("etype = '{$this->escape($req['etype'])}' AND name = '{$this->escape($req['name'])}'"); $x->find(true); if($x->count() > 0){ - $roo->jerr('is exsiting??'); + $roo->jerr('name already exists'); } } }