projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DataObjects/Core_notify.php
[Pman.Core]
/
DataObjects
/
Core_notify.php
diff --git
a/DataObjects/Core_notify.php
b/DataObjects/Core_notify.php
index
1fd7bbd
..
dfde126
100644
(file)
--- a/
DataObjects/Core_notify.php
+++ b/
DataObjects/Core_notify.php
@@
-42,7
+42,9
@@
class Pman_Core_DataObjects_Core_notify extends DB_DataObject
public $trigger_event_id; // int(11)
public $evtype; // event type (or method to call)fall
public $act_start;
public $trigger_event_id; // int(11)
public $evtype; // event type (or method to call)fall
public $act_start;
-
+ public $person_table;
+
+
/* the code above is auto generated do not remove the tag below */
###END_AUTOCODE
/* the code above is auto generated do not remove the tag below */
###END_AUTOCODE
@@
-52,8
+54,12
@@
class Pman_Core_DataObjects_Core_notify extends DB_DataObject
$this->person_id = is_object($set) ? $set->id : $set;
return;
}
$this->person_id = is_object($set) ? $set->id : $set;
return;
}
- $c = DB_DataObject::Factory('Person');
- $c->get($this->person_id);
+
+ $person_table = empty($this->person_table) ? 'Person' : $this->person_table;
+ $col = $person_table == "Person" ? 'person_id' : $person_table . '_id';
+
+ $c = DB_DataObject::Factory($person_table);
+ $c->get($this->{$col});
return $c;
}
return $c;
}
@@
-231,6
+237,18
@@
class Pman_Core_DataObjects_Core_notify extends DB_DataObject
");
}
");
}
+ if(!empty($q['from'])){
+ $this->whereAdd("
+ act_when >= '{$q['from']}'
+ ");
+ }
+
+ if(!empty($q['to'])){
+ $this->whereAdd("
+ act_when <= '{$q['to']}'
+ ");
+ }
+
}
}
}
}