projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DataObjects/Core_enum.php
[Pman.Core]
/
DataObjects
/
Core_enum.php
diff --git
a/DataObjects/Core_enum.php
b/DataObjects/Core_enum.php
index
630cc3d
..
d05bf8b
100644
(file)
--- a/
DataObjects/Core_enum.php
+++ b/
DataObjects/Core_enum.php
@@
-21,12
+21,12
@@
class Pman_Core_DataObjects_Core_enum extends DB_DataObject
/* the code above is auto generated do not remove the tag below */
###END_AUTOCODE
/* 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);
if (!empty($q['query']['empty_etype'])) {
{
// DB_DataObject::debugLevel(1);
if (!empty($q['query']['empty_etype'])) {
- $this->whereAdd("etype = ''");
+ $this->whereAdd("
core_enum.
etype = ''");
}
// this should be handled by roo... using '!name[0]' ....
}
// this should be handled by roo... using '!name[0]' ....
@@
-57,6
+57,9
@@
class Pman_Core_DataObjects_Core_enum extends DB_DataObject
core_enum.display_name LIKE '%{$name}%'
");
}
core_enum.display_name LIKE '%{$name}%'
");
}
+ if (isset($q['_etypes'])) {
+ $this->whereAddIn('core_enum.etype', explode(',', $q['_etypes']), 'string');
+ }
}
}
@@
-125,16
+128,18
@@
class Pman_Core_DataObjects_Core_enum extends DB_DataObject
function beforeUpdate($old, $request,$roo)
{
if(!empty($request['_merge_id'])){
function beforeUpdate($old, $request,$roo)
{
if(!empty($request['_merge_id'])){
- $this->merge($request['_merge_id']);
+ $this->merge($request['_merge_id']
, $roo
);
}
$tn = $this->tableName();
$x = $this->factory($tn);
}
$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("etype = '{$this->escape($request['etype'])}' AND name = '{$this->escape($request['name'])}'");
+ $x->whereAdd("id != ".((int) $this->id));
$x->find(true);
if($x->count() > 0){
$x->find(true);
if($x->count() > 0){
- $roo->jerr('
is exsiting
');
+ $roo->jerr('
a duplicate record already exists
');
}
}
}
}
}
}
@@
-156,12
+161,13
@@
class Pman_Core_DataObjects_Core_enum extends DB_DataObject
}
}
}
}
- 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!!??
}
{
$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());
function onUpdate($old, $req)
{
$x = $this->factory($this->tableName());
@@
-169,7
+175,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 ($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)."'");
}
$x->query("UPDATE core_enum SET etype = '". $this->escape($this->name)
."' WHERE etype = '". $this->escape($old->name)."'");
}
@@
-338,7
+345,7
@@
class Pman_Core_DataObjects_Core_enum extends DB_DataObject
}
}
- function merge($
id
)
+ function merge($
merge_to, $roo
)
{
$affects = array();
{
$affects = array();
@@
-359,26
+366,24
@@
class Pman_Core_DataObjects_Core_enum extends DB_DataObject
$ka = explode('.', $k);
$chk = DB_DataObject::factory($ka[0]);
$ka = explode('.', $k);
$chk = DB_DataObject::factory($ka[0]);
+
if (!is_a($chk,'DB_DataObject')) {
if (!is_a($chk,'DB_DataObject')) {
- $
this
->jerr('Unable to load referenced table, check the links config: ' .$ka[0]);
+ $
roo
->jerr('Unable to load referenced table, check the links config: ' .$ka[0]);
}
}
- // print_r(array($chk->tablename() , $ka[1] , $xx->tablename() , $this->key ));
- $chk->{$ka[1]} =
$xx->{$this->key}
;
+
+ $chk->{$ka[1]} =
$this->id
;
- if (count($chk->keys())) {
- $matches = $chk->count();
- } else {
- //DB_DataObject::DebugLevel(1);
- $matches = $chk->count($ka[1]);
+ foreach ($chk->fetchAll() as $c){
+ $cc = clone ($c);
+ $c->{$ka[1]} = $merge_to;
+ $c->update($cc);
}
}
-
- if ($matches) {
- $chk->_match_key = $ka[1];
- $match_ar[] = clone($chk);
- continue;
- }
}
}
+ $this->delete();
+
+ $roo->jok('Merged');
+
}
}