From d6b9f0a9dc8a4393093ed81169a75a68de4f48f0 Mon Sep 17 00:00:00 2001 From: KH Lau Date: Tue, 31 Oct 2017 10:37:12 +0800 Subject: [PATCH] DataObjects/Events.php --- DataObjects/Events.php | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/DataObjects/Events.php b/DataObjects/Events.php index 3af766bf..dae2a68f 100644 --- a/DataObjects/Events.php +++ b/DataObjects/Events.php @@ -255,9 +255,10 @@ class Pman_Core_DataObjects_Events extends DB_DataObject } if (isset($q['_who'])) { + //$this->autoJoin(); //$this->autoJoinCorePerson(); - //$this->selectAddWho(); + $this->selectAddWho(); } // since roo does not support autojoin yet.. @@ -731,13 +732,15 @@ class Pman_Core_DataObjects_Events extends DB_DataObject function selectAddWho() { - $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 - "); + $this->selectAdd("ext_data_id.in_firstname, ext_data_id.in_middlename, ext_data_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 + //"); } } -- 2.39.2