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

diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index 229c2ba9..72f2e2b2 100644
--- a/DataObjects/Events.php
+++ b/DataObjects/Events.php
@@ -25,7 +25,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
     public $person_id;                       // int(11)  
     public $remarks;                         // blob(65535)  blob
     public $person_table;                    // string(64)
-    
+
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
     
@@ -37,14 +37,21 @@ 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');
+				//$tn='evet';            
             
-            if(!array_key_exists("{$jt->tableName()}_id", $this->table())){ // coz we have triiger on mysql...
+            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();
 
@@ -100,7 +107,8 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         if (!$au->hasPerm("Admin.Admin_Tab", 'S')) {
             //DB_DataObject::DebugLevel(1);
             // they can only view their changes..
-            $this->person_id = $au->id;
+            $this->whereAdd("($tn.person_id = {$au->id} OR $tn.person_id = 0)");
+//            $this->person_id = $au->id;
             
         }
         // _join = tablename,tablename...
@@ -113,11 +121,9 @@ 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'])) {
             //DB_DataObject::debugLevel(1);
             $this->_extra_cols = array('qty' );
@@ -164,7 +170,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
                     LEFT JOIN {$jtn} as join_on_id_{$jtn} ON {$tn}.on_id = join_on_id_{$jtn}.{$jk}
                         AND on_table = '{$jtn}'
                 ";
-                $keys = array_keys($x->table());
+                $keys = array_keys($x->tableColumns());
                 if (isset($q['_join_cols'])) {
                     $jcs = explode(',',$q['_join_cols'] );
                     //DB_DataObject::DebugLevel(1);
@@ -245,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}%'");
         } 
         
     }
@@ -354,7 +360,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         }
          
         $ret = 0;
-        foreach(array_keys($new->table()) as $k) {
+        foreach(array_keys($new->tableColumns()) as $k) {
             // should we JSON serialize this?
             $n = empty($new->$k) ? '' : $new->$k;
             $o = empty($old->$k) || empty($old->$k) ? '' : $old->$k;