projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DataObjects/Events.php
[Pman.Core]
/
DataObjects
/
Events.php
diff --git
a/DataObjects/Events.php
b/DataObjects/Events.php
index
d516267
..
7abc664
100644
(file)
--- a/
DataObjects/Events.php
+++ b/
DataObjects/Events.php
@@
-217,9
+217,9
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
if (!$obj) {
$roo->jerr("ontable is invalid");
}
if (!$obj) {
$roo->jerr("ontable is invalid");
}
- /*
- if (!method_exists($obj,'relatedWhere')) {
- $roo->jerr( $q['_related_on_table'] . " Does not have method relatedWhere :" .
+
+ if (!method_exists($obj,'relatedWhere')
&& !method_exists($obj,'relatedEventsWhere')
) {
+ $roo->jerr( $q['_related_on_table'] . " Does not have method relatedWhere
or relatedEventsWhere
:" .
implode(',', get_class_methods($obj)));
}
if ($obj && method_exists($obj,'relatedWhere')) {
implode(',', get_class_methods($obj)));
}
if ($obj && method_exists($obj,'relatedWhere')) {
@@
-241,7
+241,8
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
}
$this->whereAdd(implode(' OR ' , $w));
}
$this->whereAdd(implode(' OR ' , $w));
- }*/
+ }
+
if ($obj && method_exists($obj,'relatedEventsWhere')) {
$a = $obj->relatedEventsWhere($q,$roo);
if($a){
if ($obj && method_exists($obj,'relatedEventsWhere')) {
$a = $obj->relatedEventsWhere($q,$roo);
if($a){
@@
-253,6
+254,14
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
}
}
+ 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..
if (!isset($q['_distinct'])) {
//$this->autoJoinExtra();
// since roo does not support autojoin yet..
if (!isset($q['_distinct'])) {
//$this->autoJoinExtra();
@@
-713,4
+722,6
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
$this->selectAdd('join_person_id_id.email as email');
}
$this->selectAdd('join_person_id_id.email as email');
}
+
+
}
}