DataObjects/Events.php

[Pman.Core] / DataObjects / Events.php

diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index 7ab63ee..7abc664 100644 (file)
--- a/DataObjects/Events.php
+++ b/DataObjects/Events.php
@@ -254,9 +254,12 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             
             
         }
-        if (!isset($q['_who'])) {
-                  $this->autoJoinExtData();
-            $this->autoJoinCorePerson();
+        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..
@@ -720,32 +723,5 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         
     }
     
-    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";                             
-    }
-    
-    function selectAddWho() 
-    {
-       $this->selectAdd("
-            core_person_id.name AS person_name, 
-            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 
-       ");
-    }
 }