DataObjects/Core_notify.php

[Pman.Core] / DataObjects / Core_notify.php

diff --git a/DataObjects/Core_notify.php b/DataObjects/Core_notify.php
index f9e8a54..31057c2 100644 (file)
--- 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;
         }
@@ -122,24 +123,25 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
     
     function applyFilters($q, $au, $roo)
     {
-//        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->_join .= "
-//                LEFT JOIN {$d->tableName()} ON {$this->tableName()}.onid = {$d->tableName()}.id
-//                {$d->_join}
-//            "; 
-//        } 
-//        if (isset($q['query']['person_id_name']) ) {
-//            $this->whereAdd( "join_person_id_id.name LIKE '{$this->escape($q['query']['person_id_name'])}%'");
-//             
-//        }
-//        
+        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 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'])}%'");
+             
+        }
+