X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_enum.php;h=38c0b9e731bfbbff5e9f603d265c9eb7ec1f64d6;hb=6e7afd5b0e0e08e31873f9e42faa3951a2c2f2d7;hp=71c340988aa7eb755d357a50545eb9a2d2ae4535;hpb=30a6fc443f4a8c9f2e2eae1b920deec3463e31ec;p=Pman.Core diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php index 71c34098..38c0b9e7 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'); + } } @@ -125,16 +138,18 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject function beforeUpdate($old, $request,$roo) { if(!empty($request['_merge_id'])){ - print_R($request);exit; + $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'); } } } @@ -144,24 +159,50 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject $x = $this->factory($tn); if(empty($req['etype'])){ + if (empty($req['name'])) { + $roo->jerr('name or etype missing'); + } if($x->get('name', $req['name'])){ - $roo->jerr('name is exsiting'); + $roo->jerr('name already exists'); } - }else{ + } else if (!empty($req['_bulk_names'])) { + + $lines = explode("\n", $req['_bulk_names']); + foreach($lines as $l) { + $l = trim($l); + if (!strlen($l)) { + continue; + } + $bits = explode(',', $l); + $x = $this->factory($tn); + $rr = array( + 'etype' => $req['etype'], + 'name' => array_shift($bits) + ); + + $rr['display_name'] = empty($bits) ? $rr['name'] : $bits[0]; + + + + } + + + } 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 +210,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 +380,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'); + + } + }