X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_enum.php;h=66e509ca6a18b7c0634c610a42e87a4264191755;hp=56253fb3ad3484717b9fd11ab7422bbfef674b0b;hb=5d4ac076dc4f620fbb91944eead3e0af66216a03;hpb=6932864e647d87dd10af802484cb8e0d667bb273 diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php index 56253fb3..66e509ca 100644 --- a/DataObjects/Core_enum.php +++ b/DataObjects/Core_enum.php @@ -1,8 +1,8 @@ whereAdd("etype = ''"); + $this->whereAdd("core_enum.etype = ''"); } // this should be handled by roo... using '!name[0]' .... @@ -57,14 +57,31 @@ 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}%' + "); + } -// print_r($this); - if(!empty($q['id'])){ - $this->id = $q['id']; + if (isset($q['_etypes'])) { + $this->whereAddIn('core_enum.etype', explode(',', $q['_etypes']), 'string'); } } + function checkPerm($lvl, $au, $req=null) + { + if (!$au) { + return false; + } + return true; + } + + function autoJoinCmsTranslate($lang) { $l = $this->escape($lang); @@ -98,7 +115,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject function postListFilter($data, $authUser, $q) { - if(!empty($q['cmsTab'])){ + /* if(!empty($q['cmsTab'])){ $ret = array(); foreach($data as $k=>$v){ if($v['name'] == 'element'){ @@ -112,7 +129,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject } $data = $ret; } - + */ return $data; } @@ -120,13 +137,19 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject function beforeUpdate($old, $request,$roo) { + 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'); } } } @@ -135,33 +158,68 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject $tn = $this->tableName(); $x = $this->factory($tn); - if(empty($req['etype'])){ + if(empty($req['etype']) || !strlen(trim($req['etype'])) ){ + + if (empty($req['name']) || !strlen(trim($req['name']))) { + $roo->jerr('name or etype missing'); + } + if($x->get('name', $req['name'])){ - $roo->jerr('name is exsiting'); + $roo->jerr("name already exists - '{$req['name']}'" ); + } + } 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); + $rr = array( + 'etype' => $req['etype'], + 'name' => array_shift($bits) + ); + + $rr['display_name'] = empty($bits) ? $rr['name'] : $bits[0]; + + $x = $this->factory($tn); + $x->beforeInsert($rr, $roo); + $x->setFrom($rr); + $x->insert(); + + } + $roo->jok("inserted"); + + } else { + if (empty($req['name']) || !strlen(trim($req['name']))) { + $roo->jerr('name missing'); } - }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 - '{$req['name']}'" ); } } } - 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) + + function onUpdate($old, $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!!?? 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)."'"); } @@ -180,6 +238,30 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject return 0; } + function lookupCreate($etype,$name, $display_name=false) { + + // check + $ce = DB_DataObject::Factory('core_enum'); + $ce->setFrom(array( + 'etype' => '', + 'name' => $etype + )); + if (!$ce->find(true)) { + $ce->display_name = $etype; + $ce->insert(); + } + + $ce = DB_DataObject::Factory('core_enum'); + $ce->etype = $etype; + $ce->name = $name; + if ($ce->find(true)) { + return $ce->id; + } + $ce->active = 1; + $ce->display_name = $display_name === false ? $ce->name : $display_name; + return $ce->insert(); + + } function lookupById($id) { $ce = DB_DataObject::Factory('core_enum'); @@ -285,7 +367,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject //$t->is_system_enum = 1; // this should be on the caller.. - if (!empty($row['seqid'])) { + if (!empty($row['seqid']) && !is_numeric($row['seqid'])) { $t->seqid = $seq_id; $seq_id++; } @@ -293,11 +375,18 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject $t->insert(); }else{ $t->find(true); // fetch it.. + $o = clone($t); + if ( isset($row['is_system_enum'])) { $t->is_system_enum = isset($row['is_system_enum']) ? $row['is_system_enum'] : $t->is_system_enum; - - $t->update(); } + + $t->display_name = isset($row['display_name']) ? $row['display_name'] : $t->display_name; + + $t->seqid = isset($row['seqid']) ? $row['seqid'] : $t->seqid; + + $t->update($o); + } if (!empty($row['cn'])) { $this->initEnums($row['cn'], array('etype' => $t->name)); @@ -306,5 +395,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'); + + } + }