DataObjects/Events.php

[Pman.Core] / DataObjects / Events.php

diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index 25ff519..3614b0f 100644 (file)
--- a/DataObjects/Events.php
+++ b/DataObjects/Events.php
@@ -255,7 +255,9 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             
         }
         if (!isset($q['_who'])) {
-            //$this->autoJoinExtra();
+                  $this->autoJoinExtData();
+            //$this->autoJoinCorePerson();
+            $this->selectAddWho(); 
         }
         
         // since roo does not support autojoin yet..
@@ -721,17 +723,21 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
     
     function autoJoinExtData()
     {
-       $this->_join .= "LEFT JOIN
+       $this->_join .= "LEFT JOIN 
                             ext_data AS ext_data_id
                         ON
                             Events.modx_users_id = ext_data_id.userdata_id";                            
     }
     
-    function autoJoinCorePerson()
+    function selectAddWho() 
     {
-       $this->_join .= "LEFT JOIN                             
-                             core_person AS core_person_id
-                        ON
-                             Events.person_id = core_person_id.id";                             
+       $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 
+       ");
     }
 }