X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_notify.php;h=6bed15b927167a4dd9e3f26096d29195f1268fcf;hb=d64494c39c71f6a045bc69405f4f3e21450ec24a;hp=3a571d657f93ee8b7f57a93ed02c23f7f8e024ab;hpb=ea32df687c38686ea7634ea4c15d32548f56f3a9;p=Pman.Core

diff --git a/DataObjects/Core_notify.php b/DataObjects/Core_notify.php
index 3a571d65..6bed15b9 100644
--- a/DataObjects/Core_notify.php
+++ b/DataObjects/Core_notify.php
@@ -67,8 +67,9 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
         if ($this->onid == 0) {
             return $c; // empty dataobject.
         }
-        
+        print_r($c);exit;
         $c->autoJoin();
+        
         if ($c->get($this->onid)) {
             return $c;
         }
@@ -125,21 +126,20 @@ 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->data_select);
-            
-            $this->_join .= $d->join; 
-            echo '<PRE>';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'])}%'");
+             
         }