DataObjects/Events.php

[Pman.Core] / DataObjects / Events.php

diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index fa86a9c..ed9fe50 100644 (file)
--- a/DataObjects/Events.php
+++ b/DataObjects/Events.php
@@ -25,7 +25,6 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
     public $person_id;                       // int(11)  
     public $remarks;                         // blob(65535)  blob
     public $person_table;                    // string(64)
-    public $investor_id;                           // int(11)  
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -49,7 +48,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
                 $this->selectAdd();
                 $this->selectAs();
 
-                $this->selectAs($jt, 'person_id_%s', 'join_person_id_id');
+                $this->selectAs($jt, 'person_id_%s', 'join_person_id_id_2');
 
                 if (method_exists($jt,'nameColumn')) {
                     $this->selectAdd("join_person_id_id.{$jt->nameColumn()} as person_id_name");
@@ -101,7 +100,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...
@@ -116,9 +116,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             // empty ontable queries.. these are valid..
             $this->whereAdd("$tn.on_table = ''");
         }
-        
-        
-        
+      
         if (isset($q['query']['person_sum'])) {
             //DB_DataObject::debugLevel(1);
             $this->_extra_cols = array('qty' );