X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FEvents.php;h=72f2e2b2ee08fd779034ec54824ecba0e8144797;hb=a445ea22d7f3140b81870f704cb0a70a8cde4438;hp=d573e4ed35eca445a5274e08bbbd8792557c464d;hpb=9e9ddc4a06d04c6ef7b387f316c6bf0ac0c002d2;p=Pman.Core

diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index d573e4ed..72f2e2b2 100644
--- a/DataObjects/Events.php
+++ b/DataObjects/Events.php
@@ -37,19 +37,23 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
     {
         $tn = $this->tableName();
         // if not empty on_table
-        echo $this->tableName();
+        
         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');
+				//$tn='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->selectAdd("(select count(*) from Events where Events.dup_id = evet.id) as cnt ");
-                $this->selectAs($et,'%s','evet');
+                $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();
 
                 $this->selectAs($jt, 'person_id_%s', 'join_person_id_id');
 
@@ -117,7 +121,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'])) {
@@ -247,12 +251,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}%'");
         } 
         
     }