X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FEvents.php;h=9585f5b0f5922fbf11793663e6151f093a00c75b;hp=8bc71bf8d12fd21dbcc2bccab385ed597d80f744;hb=1a2534f90f62799957ed5a9ef06359424ca94b8a;hpb=a5cceb42f2e4c0cff437a83e4f767610e89f3c5c

diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index 8bc71bf8..9585f5b0 100644
--- a/DataObjects/Events.php
+++ b/DataObjects/Events.php
@@ -37,18 +37,22 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
     {
         $tn = $this->tableName();
         // if not empty on_table
+        
         if(!empty($q['person_table'])){
             $jt = DB_DataObject::factory($q['person_table']);
 
             $et = DB_DataObject::factory($tn);
+            //$this->selectAdd("(select count(*) from Events where Events.dup_id = evet.id) as cnt ");
+            //$this->selectAs($et,'%s','evet');
             
             if(!array_key_exists("{$jt->tableName()}_id", $this->tableColumns())){ // coz we have triiger on mysql...
                 
                 $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->_join = "LEFT JOIN {$jt->tableName()} AS join_person_id_id ON (join_person_id_id.{$keys[0]}={$tn}.person_id)";
+                //$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($et,'%s','evet');
+                $this->selectAs();
 
                 $this->selectAs($jt, 'person_id_%s', 'join_person_id_id');
 
@@ -116,7 +120,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         
         if (isset($q['on_table']) && !strlen($q['on_table'])) {
             // empty ontable queries.. these are valid..
-            $this->whereAdd("$tn.on_table = ''");
+            $this->whereAdd("{$tn}.on_table = ''");
         }
       
         if (isset($q['query']['person_sum'])) {
@@ -246,12 +250,12 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         
         if(!empty($q['query']['action'])) {
             $act = $this->escape($q['query']['action']);
-            $this->whereAdd("Events.action LIKE '%{$act}%'");
+            $this->whereAdd("{$tn}.action LIKE '%{$act}%'");
         }
         
         if(!empty($q['query']['on_table'])) {
             $tnb = $this->escape($q['query']['on_table']);
-            $this->whereAdd("Events.on_table LIKE '%{$tnb}%'");
+            $this->whereAdd("{$tn}.on_table LIKE '%{$tnb}%'");
         } 
         
     }