X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_notify.php;h=5cefbba914d61cbebf086a424e57603a51c8143d;hb=50024bcfbe4548ccff5fd19c30b16231bdd7a0fc;hp=fbc58bf4a1a41bfbcb11525f5d99ae0569f04881;hpb=079abd187c74a85e7520158f720cd4dec21173a7;p=Pman.Core diff --git a/DataObjects/Core_notify.php b/DataObjects/Core_notify.php index fbc58bf4..5cefbba9 100644 --- a/DataObjects/Core_notify.php +++ b/DataObjects/Core_notify.php @@ -68,7 +68,9 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject return $c; // empty dataobject. } + print_r($this->onid);exit; $c->autoJoin(); + if ($c->get($this->onid)) { return $c; } @@ -122,18 +124,23 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject function applyFilters($q, $au, $roo) { - if (isset($q['ontable'])) { + if (isset($q['ontable']) && !in_array($q['ontable'], array('Person', 'Events' . 'core_watch'))) { + // this will only work on tables not joined to ours. + + //DB_DAtaObject::DebugLevel(1); // then we can build a join.. $d = DB_DataObject::Factory($q['ontable']); $d->autoJoin(); - echo '
';print_R($d); - exit; - - - - - - + //$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->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'])}%'"); + }