DataObjects/Events.php

[Pman.Core] / DataObjects / Events.php

diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index 8a4ccc7..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)");
@@ -219,7 +219,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             }
             
             if (!method_exists($obj,'relatedWhere')) {
-                $roo->jerr( $q['_related_on_table'] . " Does not have method relatedWhere :" .
+                $roo->jerr( $q['_related_on_table'] . " Does not have method relatedWhere  or relatedEventsWhere:" .
                            implode(',', get_class_methods($obj)));
             }
             if ($obj && method_exists($obj,'relatedWhere')) {
@@ -242,17 +242,11 @@ 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);
-                }
-            }
-            
-            
             
+         
             
         }
+        
         // since roo does not support autojoin yet..
         if (!isset($q['_distinct'])) {
             //$this->autoJoinExtra();
@@ -713,4 +707,6 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         $this->selectAdd('join_person_id_id.email as email');
         
     }
+    
+    
 }