DataObjects/Events.php

[Pman.Core] / DataObjects / Events.php

diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index d516267..c4970ca 100644 (file)
--- a/DataObjects/Events.php
+++ b/DataObjects/Events.php
@@ -217,9 +217,9 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             if (!$obj) {
                 $roo->jerr("ontable is invalid");
             }
-            /*
-            if (!method_exists($obj,'relatedWhere')) {
-                $roo->jerr( $q['_related_on_table'] . " Does not have method relatedWhere :" .
+            
+            if (!method_exists($obj,'relatedWhere') && !method_exists($obj,'relatedEventsWhere')) {
+                $roo->jerr( $q['_related_on_table'] . " Does not have method relatedWhere  or relatedEventsWhere:" .
                            implode(',', get_class_methods($obj)));
             }
             if ($obj && method_exists($obj,'relatedWhere')) {
@@ -241,7 +241,8 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
                     
                 }
                 $this->whereAdd(implode(' OR ' , $w));
-            }*/
+            }
+            
             if ($obj && method_exists($obj,'relatedEventsWhere')) {
                 $a = $obj->relatedEventsWhere($q,$roo);
                 if($a){
@@ -253,6 +254,11 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             
             
         }
+        if (!isset($q['_who'])) {
+                  $this->autoJoinExtData();
+            $this->autoJoinCorePerson();
+        }
+        
         // since roo does not support autojoin yet..
         if (!isset($q['_distinct'])) {
             //$this->autoJoinExtra();
@@ -713,4 +719,20 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         $this->selectAdd('join_person_id_id.email as email');
         
     }
+    
+    function autoJoinExtData()
+    {
+       $this->_join .= "LEFT JOIN
+                            ext_data AS ext_data_id
+                        ON
+                            Events.modx_users_id = ext_data_id.userdata_id";                            
+    }
+    
+    function autoJoinCorePerson()
+    {
+       $this->_join .= "LEFT JOIN                             
+                             core_person AS core_person_id
+                        ON
+                             Events.person_id = core_person_id.id";                             
+    }
 }