X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FEvents.php;h=372533cbbaffb5a43aad1d52a8ca021e509c7be4;hb=5c458c0ecb482b5c19fbf977e71718ac334e3f93;hp=85cc2618b27b65e90c8b6b05270ab58240c1075e;hpb=657d9e2bf3db63bb8da09f39cc2ecb09debbe13a;p=Pman.Core

diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index 85cc2618..372533cb 100644
--- a/DataObjects/Events.php
+++ b/DataObjects/Events.php
@@ -217,9 +217,9 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             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')) {
@@ -241,7 +241,8 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
                     
                 }
                 $this->whereAdd(implode(' OR ' , $w));
-            }*/
+            }
+            
             if ($obj && method_exists($obj,'relatedEventsWhere')) {
                 $a = $obj->relatedEventsWhere($q,$roo);
                 if($a){
@@ -253,6 +254,14 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             
             
         }
+        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..
         if (!isset($q['_distinct'])) {
             //$this->autoJoinExtra();
@@ -333,23 +342,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             $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(),            
-               ));
-               
-   
-               if($e->find(true)){
-               	print_r($e);
-               	exit;
-                   $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';
@@ -446,7 +439,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
                 $this->ipaddr = $_SERVER['HTTP_X_FORWARDED_FOR'];
             }
-        }
+        }        
     }
     
     function beforeUpdate($old, $request,$roo)
@@ -729,4 +722,26 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         $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("join_person_id_userdata_id.in_firstname, join_person_id_userdata_id.in_middlename, join_person_id_userdata_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 
+       //");
+    }
 }