X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_notify_recur.php;h=bd683128b44c16e7f7a6d1c23f92f857b9064b42;hb=2a38115acdac2ba798a0f73a9d39d7a72b7e5787;hp=8ec2043b0fd30a72de57e3d429db149869f9c9fc;hpb=84a94b3daeebb94665ab64abb3aa92693b1ca4c7;p=Pman.Core diff --git a/DataObjects/Core_notify_recur.php b/DataObjects/Core_notify_recur.php index 8ec2043b..bd683128 100644 --- a/DataObjects/Core_notify_recur.php +++ b/DataObjects/Core_notify_recur.php @@ -48,7 +48,19 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject * /* the code above is auto generated do not remove the tag below */ - + function applyFilters($q, $au, $roo) + { + + if (isset($q['query']['person_id_name']) ) { + $this->whereAdd( "join_person_id_id.name LIKE '{$this->escape($q['query']['person_id_name'])}%'"); + + } + + + + + + } function notifytimesRange($advance) { $start = date('Y-m-d H:i:s', max(strtotime("NOW"), strtotime($this->dtstart))); @@ -60,7 +72,7 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject { $e = DB_DataObject::Factory('core_enum'); $e->get($this->method_id); - + return $e; } function notifytimes($advance) @@ -143,6 +155,13 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject if (isset($old[$time])) { // we already have it... + + $oo = DB_DataObject::Factory('core_notify'); + $oo->get($old[$time]); + $oc = clone($oo); + $oo->evtype = $this->method()->name; + $oo->update($oc); + unset($old[$time]); continue; } @@ -192,4 +211,5 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject // should delete old events that have not occurred... $n->delete(DB_DATAOBJECT_WHEREADD_ONLY); } + }