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
..
ea3c02a
100644
(file)
--- a/
DataObjects/Core_enum.php
+++ b/
DataObjects/Core_enum.php
@@
-26,7
+26,7
@@
class Pman_Core_DataObjects_Core_enum extends DB_DataObject
// 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]' ....
@@
-125,7
+125,7
@@
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();
}
$tn = $this->tableName();
@@
-338,7
+338,7
@@
class Pman_Core_DataObjects_Core_enum extends DB_DataObject
}
}
- function merge($
id
)
+ function merge($
merge_to, $roo
)
{
$affects = array();
{
$affects = array();
@@
-359,26
+359,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');
+
}
}