DataObjects/Events.php

[Pman.Core] / DataObjects / Events.php

diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index 8a4ccc7..372533c 100644 (file)
--- a/DataObjects/Events.php
+++ b/DataObjects/Events.php
@@ -218,8 +218,8 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
                 $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')) {
@@ -242,6 +242,7 @@ 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,14 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             
             
         }
+        if (isset($q['_who'])) {
+                  
+                  $e = PDO_DataObject::factory('ext_data');
+                  $this->joinAdd($e,'LEFT');
+            //$this->autoJoinCorePerson();
+            $this->selectAddWho(); 
+        }
+        
         // since roo does not support autojoin yet..
         if (!isset($q['_distinct'])) {
             //$this->autoJoinExtra();
@@ -713,4 +722,26 @@ 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 selectAddWho() 
+    {
+        $this->selectAdd("join_person_id_userdata_id.in_firstname, join_person_id_userdata_id.in_middlename, join_person_id_userdata_id.in_lastname");
+       
+       //$this->selectAdd("             
+       //     CASE
+       //         WHEN ext_data_id.in_middlename='' THEN
+       //             CONCAT_WS(' ', ext_data_id.in_firstname,ext_data_id.in_lastname)
+       //         ELSE
+       //             CONCAT_WS(' ', ext_data_id.in_firstname,ext_data_id.in_middlename,ext_data_id.in_lastname)
+       //     END AS ext_data_full_name 
+       //");
+    }
 }