X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_notify.php;h=31057c2f3c1293f3909a952d2b525f49caa54107;hp=9195de9faa5e6c7e84041859b381ed6054236e50;hb=3d6f3f3d89c16df61d6c25746464ac98b8f93f3c;hpb=e20d7d1dba9ff1d68baa834ab7d9a724315b587c

diff --git a/DataObjects/Core_notify.php b/DataObjects/Core_notify.php
index 9195de9f..31057c2f 100644
--- a/DataObjects/Core_notify.php
+++ b/DataObjects/Core_notify.php
@@ -69,6 +69,7 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
         }
         
         $c->autoJoin();
+        
         if ($c->get($this->onid)) {
             return $c;
         }
@@ -125,16 +126,21 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
         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();
-            $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->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'])}%'");
+             
+        }