DataObjects/I18n.php

[Pman.Core] / DataObjects / Events.php

diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index a0fb6fd..9f7a7da 100644 (file)
--- a/DataObjects/Events.php
+++ b/DataObjects/Events.php
@@ -36,12 +36,13 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
     function applyFilters($q, $au ,$roo)
     {
         $tn = $this->tableName();
-        print_r($this->databaseStructure());exit;
         // if not empty on_table
         if(!empty($q['person_table'])){
             $jt = DB_DataObject::factory($q['person_table']);
-        
-            $this->_join = "LEFT JOIN {$jt->tableName()} AS join_person_id_id ON (join_person_id_id.id=Events.person_id)";
+            
+            $keys = $jt->keys();
+            
+            $this->_join = "LEFT JOIN {$jt->tableName()} AS join_person_id_id ON (join_person_id_id.{$keys[0]}=Events.person_id)";
             $this->selectAdd();
             $this->selectAs();
             
@@ -50,6 +51,10 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             if (method_exists($jt,'nameColumn')) {
                 $this->selectAdd("join_person_id_id.{$jt->nameColumn()} as person_id_name");
             }
+            
+            if (method_exists($jt,'emailColumn')) {
+                $this->selectAdd("join_person_id_id.{$jt->emailColumn()} as person_id_email");
+            }
         
         
         } else {