X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_notify.php;h=6bed15b927167a4dd9e3f26096d29195f1268fcf;hb=d64494c39c71f6a045bc69405f4f3e21450ec24a;hp=f7ec69376a2310b77dd5ef6fdc19f3dac8b100b3;hpb=4ac4082577a2e070bc886dcd50ac9e83b666d771;p=Pman.Core

diff --git a/DataObjects/Core_notify.php b/DataObjects/Core_notify.php
index f7ec6937..6bed15b9 100644
--- a/DataObjects/Core_notify.php
+++ b/DataObjects/Core_notify.php
@@ -7,6 +7,7 @@
  *
 CREATE TABLE  core_notify  (
   `id` int(11)  NOT NULL AUTO_INCREMENT,
+  `recur_id` INT(11) NOT NULL;
   `act_when` DATETIME NOT NULL,
   `onid` int(11)  NOT NULL DEFAULT 0,
   `ontable` varchar(128)  NOT NULL DEFAULT '',
@@ -28,6 +29,7 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
 
     public $__table = 'core_notify';                     // table name
     public $id;                              // int(11)  not_null primary_key auto_increment
+    public $recur_id;                        // int(11) not_null
     public $act_when;                        // datetime(19)  not_null multiple_key binary
     public $onid;                            // int(11)  not_null
     public $ontable;                         // string(128)  not_null
@@ -38,7 +40,7 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
     public $watch_id;                        // int(11)  
     public $trigger_person_id;                 // int(11)
     public $trigger_event_id;              // int(11)  
-    public $evtype;                         // event type                       
+    public $evtype;                         // event type (or method to call)fall
     
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -65,8 +67,9 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
         if ($this->onid == 0) {
             return $c; // empty dataobject.
         }
-        
+        print_r($c);exit;
         $c->autoJoin();
+        
         if ($c->get($this->onid)) {
             return $c;
         }
@@ -117,4 +120,33 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
         }
         
     }
+    
+    function applyFilters($q, $au, $roo)
+    {
+        if (isset($q['ontable']) && !in_array($q['ontable'], array('Person', 'Events' . 'core_watch'))) {
+            // this will only work on tables not joined to ours.
+            
+            //DB_DAtaObject::DebugLevel(1);
+            // then we can build a join..
+            $d = DB_DataObject::Factory($q['ontable']);
+            $d->autoJoin();
+            //$this->selectAdd($d->_query['data_select']); -- this will cause the same dataIndex...
+            $this->_join .= "
+                LEFT JOIN {$d->tableName()} ON {$this->tableName()}.onid = {$d->tableName()}.id
+                {$d->_join}
+            "; 
+            $this->selectAs($d, 'core_notify_%s');
+        } 
+        if (isset($q['query']['person_id_name']) ) {
+            $this->whereAdd( "join_person_id_id.name LIKE '{$this->escape($q['query']['person_id_name'])}%'");
+             
+        }
+        
+        
+        
+        
+        
+        
+    }
+    
 }