if (!$obj) {
$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')) {
}
$this->whereAdd(implode(' OR ' , $w));
- }*/
+ }
+
if ($obj && method_exists($obj,'relatedEventsWhere')) {
$a = $obj->relatedEventsWhere($q,$roo);
if($a){
}
+ if (!isset($q['_who'])) {
+ $this->autoJoinExtData();
+ //$this->autoJoinCorePerson();
+ $this->selectAddWho();
+ }
+
// since roo does not support autojoin yet..
if (!isset($q['_distinct'])) {
//$this->autoJoinExtra();
$cols = $this->tableColumns();
$col = isset($cols[$col]) ? $col : 'person_id'; // for BC.... - revert to using person_id
$this->{$col} = $au->pid();
- //$this->person_id = $au ? (!empty($au->id) ? $au->id : $au->pid()) : -1;
-
- $this->who = $au->name;
-
- if($au->tableName() == "modx_users"){
- $e = PDO_DataObject::factory('ext_data');
- $e->setFrom(array(
- 'userdata_id' => $au->pid(),
- ));
- print_r($e);
- exit;
- if($e->find(true)){
- $this->who = $e->getUserName();
- }
- }
+ //$this->person_id = $au ? (!empty($au->id) ? $au->id : $au->pid()) : -1;
}
$this->person_table = $au ? $au->tableName() : '';
$this->ipaddr = isset($_SERVER["REMOTE_ADDR"]) ? $_SERVER["REMOTE_ADDR"] : 'cli';
if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
$this->ipaddr = $_SERVER['HTTP_X_FORWARDED_FOR'];
}
- }
+ }
}
function beforeUpdate($old, $request,$roo)
$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("
+ 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
+ ");
+ }
}