From e28f85cf165ca314df0624a6e120d33100413af2 Mon Sep 17 00:00:00 2001 From: KH Lau Date: Tue, 24 Oct 2017 10:38:35 +0800 Subject: [PATCH] DataObjects/Events.php --- DataObjects/Events.php | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/DataObjects/Events.php b/DataObjects/Events.php index 72f2e2b2..ca02b023 100644 --- a/DataObjects/Events.php +++ b/DataObjects/Events.php @@ -42,16 +42,15 @@ class Pman_Core_DataObjects_Events extends DB_DataObject $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'; + $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]}={$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->_join = "LEFT JOIN {$jt->tableName()} AS join_person_id_id ON (join_person_id_id.{$keys[0]}=Events.person_id)"; + $this->selectAdd(); $this->selectAs(); @@ -121,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'])) { @@ -251,12 +250,12 @@ class Pman_Core_DataObjects_Events extends DB_DataObject if(!empty($q['query']['action'])) { $act = $this->escape($q['query']['action']); - $this->whereAdd("{$tn}.action LIKE '%{$act}%'"); + $this->whereAdd("Events.action LIKE '%{$act}%'"); } if(!empty($q['query']['on_table'])) { $tnb = $this->escape($q['query']['on_table']); - $this->whereAdd("{$tn}.on_table LIKE '%{$tnb}%'"); + $this->whereAdd("Events.on_table LIKE '%{$tnb}%'"); } } -- 2.39.2