X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_enum.php;h=062041f0c16f994d835b40b8699f24531ef2d0cf;hb=7790a37ecaf891c820200ba32c26e2cf56cb55e6;hp=3ed13ebefdf5a8fa07051cc05753d4966f2e5831;hpb=1cf45e97df880fb74734cab43c0e2d2e93db62d3;p=Pman.Core diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php index 3ed13ebe..062041f0 100644 --- a/DataObjects/Core_enum.php +++ b/DataObjects/Core_enum.php @@ -1,6 +1,6 @@ whereAdd("etype = ''"); + $this->whereAdd("core_enum.etype = ''"); } // this should be handled by roo... using '!name[0]' .... @@ -57,6 +57,19 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject core_enum.display_name LIKE '%{$name}%' "); } + if(!empty($q['query']['search_begins'])) { + $name = $this->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'); + } } @@ -124,17 +137,19 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject function beforeUpdate($old, $request,$roo) { - if(!empty($request['_merge_with'])){ - + if(!empty($request['_merge_id'])){ + $this->merge($request['_merge_id'], $roo); } $tn = $this->tableName(); $x = $this->factory($tn); - if(!($old->etype == $request['etype'] && $old->name == $request['name'])){ + // 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('is exsiting'); + $roo->jerr('a duplicate record already exists'); } } } @@ -145,23 +160,24 @@ 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'); } } } - 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()); @@ -169,7 +185,8 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject if ($old->etype != $this->etype) { $x->query("SELECT core_enum_seqmax_update('". $this->escape($old->etype) ."')"); } - if($this->name != $old->name && empty($old->etype) && empty($this->etype)){ + + if($this->name != $old->name && !empty($old->name) && empty($old->etype) && empty($this->etype)){ $x->query("UPDATE core_enum SET etype = '". $this->escape($this->name) ."' WHERE etype = '". $this->escape($old->name)."'"); } @@ -338,5 +355,46 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject } + function merge($merge_to, $roo) + { + $affects = array(); + + $all_links = $GLOBALS['_DB_DATAOBJECT']['LINKS'][$this->_database]; + + foreach($all_links as $tbl => $links) { + foreach($links as $col => $totbl_col) { + $to = explode(':', $totbl_col); + if ($to[0] != $this->tableName()) { + continue; + } + + $affects[$tbl .'.' . $col] = true; + } + } + + foreach($affects as $k => $true) { + $ka = explode('.', $k); + + $chk = DB_DataObject::factory($ka[0]); + + if (!is_a($chk,'DB_DataObject')) { + $roo->jerr('Unable to load referenced table, check the links config: ' .$ka[0]); + } + + $chk->{$ka[1]} = $this->id; + + foreach ($chk->fetchAll() as $c){ + $cc = clone ($c); + $c->{$ka[1]} = $merge_to; + $c->update($cc); + } + } + + $this->delete(); + + $roo->jok('Merged'); + + } + }