X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_notify_recur.php;h=8901af3acdd3ec21535040d77fbde1dcca909740;hb=622abb877b3e426f8bde4c1e0b0211ea880b33e6;hp=18f16c52ee13e7324928cf0d2163480d55d15f06;hpb=eae738ee66c8f0ee4abe99dc692131c58cb893a1;p=Pman.Core

diff --git a/DataObjects/Core_notify_recur.php b/DataObjects/Core_notify_recur.php
index 18f16c52..8901af3a 100644
--- a/DataObjects/Core_notify_recur.php
+++ b/DataObjects/Core_notify_recur.php
@@ -48,7 +48,20 @@ 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 +73,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 +156,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;
             }
@@ -161,7 +181,7 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
                 "person_id" => $this->person_id,
                 "onid" => $this->onid,
                 "ontable" => $this->ontable,
-                'evtype' => $this->method,
+                'evtype' => $this->method()->name,
             ));
             $add->insert();
         }