DataObjects/Core_notify.php

[Pman.Core] / DataObjects / Core_notify.php

diff --git a/DataObjects/Core_notify.php b/DataObjects/Core_notify.php
index 4f0d684..8e5f607 100644 (file)
--- a/DataObjects/Core_notify.php
+++ b/DataObjects/Core_notify.php
@@ -90,6 +90,13 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
         }
         
     }
+    function beforeUpdate($old, $request,$roo)
+    {
+        if (empty($request['act_when']) && !empty($request['act_start'])) {
+            $this->act_start($request['act_start']);
+        }
+    }
+    
     
     function act_start($set = false)
     {
@@ -179,7 +186,7 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
             "; 
             $this->selectAs($d, 'core_notify_%s');
         } 
-        if (isset($q['query']['person_id_name']) ) {
+        if (!empty($q['query']['person_id_name']) ) {
             $this->whereAdd( "join_person_id_id.name LIKE '{$this->escape($q['query']['person_id_name'])}%'");
              
         }
@@ -208,7 +215,19 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
             }
         }
         
-        
+        $this->selectAdd("
+            (SELECT
+                    display_name
+            FROM
+                    core_enum
+            WHERE
+                    etype = 'Core.NotifyType'
+                AND
+                    name = core_notify.evtype
+                AND
+                    active = 1
+            ) AS evtype_align
+        ");