X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_watch.php;h=568ea97bfb4b6907db5f4fc9b687e7e51729f5d0;hb=9cecbb042ef596c3c6a353482fc1c03913661d81;hp=bccfe438e07db290bf1de9a98b2593979a299498;hpb=3f1d2b673565e2066d5cff3678a234d78e337756;p=Pman.Core

diff --git a/DataObjects/Core_watch.php b/DataObjects/Core_watch.php
index bccfe438..568ea97b 100644
--- a/DataObjects/Core_watch.php
+++ b/DataObjects/Core_watch.php
@@ -1,4 +1,3 @@
-
 <?php
 /**
  * Table Definition for core_watch
@@ -54,11 +53,16 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
         if (!empty($q['_list_actions'])) {
             $this->listActions($roo,$q);
         }
+        //die("apply filters");
         if (!empty($q['_split_event_name'])) {
             $this->selectAdd("
                 
-                substr( event, substring_index(event, '.')) as event_left,
-                substr( event, substring_index(event, '.')) as event_right        
+                substr( event, 1, LOCATE( '.',event) -1) as event_left,
+                substr( event,   LOCATE( '.',event) +1) as event_right,
+                (SELECT
+                    display_name FROM core_enum where etype = '{$this->escape($q['_split_event_name'])}'
+                    AND name = substr( event,   LOCATE( '.',event) +1)
+                ) as event_right_display_name
                              
             ");
             
@@ -67,6 +71,27 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
         }
         
     }
+    
+    function toRooSingleArray($au,$q)
+    {
+        $ret = $this->toArray();
+        if (empty($q['_split_event_name'])) {
+            return $ret;
+        }
+        $bits = explode('.', $this->event);
+        $ret['event_left'] = $bits[0];
+        $ret['event_right'] = $bits[1];
+        // check core enu.
+        if (!empty($ret['event_right'])) {
+            $ce = DB_DataObject::factory('core_enum')->lookupObject($q['_split_event_name'], $ret['event_right']);
+            $ret['event_right_display_name'] = $ce->display_name;
+        }
+        
+        return $ret;
+        
+        
+    }
+    
     function listActions($roo, $q) {
         
         //print_r($q);
@@ -192,7 +217,7 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
     
     function notifyEvent($event)
     {
-        //print_r($event);
+        print_r($event);
        //DB_DataObject::DebugLevel(1);
         // see if there are any watches on events..
         // notify everyone flagged except the person doing it...
@@ -215,7 +240,7 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
  
         $watches = $w->fetchAll();
         
-        //print_R($watches); //exit;
+        //print_R($watches); 
         
         $nn = DB_DataObject::Factory('core_notify');
         $nn->ontable    = $event->on_table;