DataObjects/Events.php

[Pman.Core] / DataObjects / Events.php

diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index 3843b8d..db9145b 100644 (file)
--- a/DataObjects/Events.php
+++ b/DataObjects/Events.php
@@ -107,7 +107,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         }
         */
         
-        if (!$au->hasPerm("Admin.Admin_Tab", 'S')) {
+        if (!$au->hasPerm("Admin.Admin_Tab", 'S') &&  !$au->hasPerm("BAdmin.BAdmin", 'S')) {
             //DB_DataObject::DebugLevel(1);
             // they can only view their changes..
             $this->whereAdd("($tn.person_id = {$au->id} OR $tn.person_id = 0)");
@@ -218,7 +218,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
                 $roo->jerr("ontable is invalid");
             }
             
-            if (!method_exists($obj,'relatedWhere') && !method_exists($obj,'relatedEventsWhere')) {
+            if (!method_exists($obj,'relatedWhere')) {
                 $roo->jerr( $q['_related_on_table'] . " Does not have method relatedWhere  or relatedEventsWhere:" .
                            implode(',', get_class_methods($obj)));
             }
@@ -243,22 +243,8 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
                 $this->whereAdd(implode(' OR ' , $w));
             }
             
-            if ($obj && method_exists($obj,'relatedEventsWhere')) {
-                $a = $obj->relatedEventsWhere($q,$roo);
-                if($a){
-                    $this->whereAdd($a);
-                }
-            }
-            
-            
-            
+         
             
-        }
-        if (isset($q['_who'])) {
-                  $e = PDO_DataObject::factory('ext_data');
-                  $this->joinAdd($e,'LEFT');
-            //$this->autoJoinCorePerson();
-            $this->selectAddWho(); 
         }
         
         // since roo does not support autojoin yet..
@@ -722,25 +708,5 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         
     }
     
-    function autoJoinExtData()
-    {
-       $this->_join .= "LEFT JOIN 
-                            ext_data AS ext_data_id
-                        ON
-                            Events.modx_users_id = ext_data_id.userdata_id";                            
-    }
     
-    function selectAddWho() 
-    {
-        $this->selectAdd("ext_data_id.in_firstname, ext_data_id.in_middlename, ext_data_id.in_lastname");
-       
-       //$this->selectAdd("             
-       //     CASE
-       //         WHEN ext_data_id.in_middlename='' THEN
-       //             CONCAT_WS(' ', ext_data_id.in_firstname,ext_data_id.in_lastname)
-       //         ELSE
-       //             CONCAT_WS(' ', ext_data_id.in_firstname,ext_data_id.in_middlename,ext_data_id.in_lastname)
-       //     END AS ext_data_full_name 
-       //");
-    }
 }