projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d948c36
)
DataObjects/Events.php
author
KH Lau
<khlau@roojs.com>
Mon, 30 Oct 2017 05:19:41 +0000
(13:19 +0800)
committer
KH Lau
<khlau@roojs.com>
Mon, 30 Oct 2017 05:19:41 +0000
(13:19 +0800)
DataObjects/Events.php
patch
|
blob
|
history
diff --git
a/DataObjects/Events.php
b/DataObjects/Events.php
index
da1e924
..
3614b0f
100644
(file)
--- a/
DataObjects/Events.php
+++ b/
DataObjects/Events.php
@@
-254,10
+254,10
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
}
}
- if (isset($q['_who'])) {
+ if (
!
isset($q['_who'])) {
$this->autoJoinExtData();
$this->autoJoinExtData();
- $this->autoJoinCorePerson();
-
//
$this->selectAddWho();
+
//
$this->autoJoinCorePerson();
+ $this->selectAddWho();
}
// since roo does not support autojoin yet..
}
// since roo does not support autojoin yet..
@@
-729,18
+729,9
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
Events.modx_users_id = ext_data_id.userdata_id";
}
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()
{
function selectAddWho()
{
- $this->selectAdd("
- core_person_id.name AS person_name,
+ $this->selectAdd("
CASE
WHEN ext_data_id.in_middlename='' THEN
CONCAT_WS(' ', ext_data_id.in_firstname,ext_data_id.in_lastname)
CASE
WHEN ext_data_id.in_middlename='' THEN
CONCAT_WS(' ', ext_data_id.in_firstname,ext_data_id.in_lastname)