DataObjects/Events.php

[Pman.Core] / DataObjects / Events.php

diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index 463ea3e..38f23af 100644 (file)
--- a/DataObjects/Events.php
+++ b/DataObjects/Events.php
@@ -94,7 +94,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         
         if(!empty($q['_with_dupe_count'])){
             $this->dupe_id = 0;                                   
-            $this->selectAdd("(select count(*)+1 from Events where Events.dupe_id = {$tn}.id) as dupe_count");
+            $this->selectAdd("(select count(*)+1 from Events ev_cnt where ev_cnt.dupe_id = {$tn}.id) as dupe_count");
         }
         /*
         if (!empty($q['query']['grouped']) && $q['query']['grouped'] == 'gr') {
@@ -217,6 +217,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             if (!$obj) {
                 $roo->jerr("ontable is invalid");
             }
+            /*
             if (!method_exists($obj,'relatedWhere')) {
                 $roo->jerr( $q['_related_on_table'] . " Does not have method relatedWhere :" .
                            implode(',', get_class_methods($obj)));
@@ -240,12 +241,17 @@ 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'])) {