projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DataObjects/Core_notify.php
[Pman.Core]
/
DataObjects
/
Core_notify.php
diff --git
a/DataObjects/Core_notify.php
b/DataObjects/Core_notify.php
index
a54d1e3
..
f3cb60f
100644
(file)
--- a/
DataObjects/Core_notify.php
+++ b/
DataObjects/Core_notify.php
@@
-64,11
+64,15
@@
class Pman_Core_DataObjects_Core_notify extends DB_DataObject
return $set;
}
$c = DB_DataObject::factory($this->ontable);
return $set;
}
$c = DB_DataObject::factory($this->ontable);
+
if ($this->onid == 0) {
return $c; // empty dataobject.
}
if ($this->onid == 0) {
return $c; // empty dataobject.
}
-
+ $test = DB_DataObject::factory('crm_mailing_list_message');
+ $test->get(1);
+ print_r($test);exit;
$c->autoJoin();
$c->autoJoin();
+
if ($c->get($this->onid)) {
return $c;
}
if ($c->get($this->onid)) {
return $c;
}
@@
-129,12
+133,17
@@
class Pman_Core_DataObjects_Core_notify extends DB_DataObject
// then we can build a join..
$d = DB_DataObject::Factory($q['ontable']);
$d->autoJoin();
// then we can build a join..
$d = DB_DataObject::Factory($q['ontable']);
$d->autoJoin();
- $this->selectAdd($d->_query['data_select']);
+ //$this->selectAdd($d->_query['data_select']); -- this will cause the same dataIndex...
$this->_join .= "
LEFT JOIN {$d->tableName()} ON {$this->tableName()}.onid = {$d->tableName()}.id
{$d->_join}
";
$this->_join .= "
LEFT JOIN {$d->tableName()} ON {$this->tableName()}.onid = {$d->tableName()}.id
{$d->_join}
";
+ $this->selectAs($d, 'core_notify_%s');
}
}
+ if (isset($q['query']['person_id_name']) ) {
+ $this->whereAdd( "join_person_id_id.name LIKE '{$this->escape($q['query']['person_id_name'])}%'");
+
+ }