Pman.Tab.AdminWatches.bjs

Pman.Tab.AdminWatches.js

diff --git a/Pman.Tab.AdminWatches.bjs b/Pman.Tab.AdminWatches.bjs
index e52d7a0..2f08fac 100644 (file)
--- a/Pman.Tab.AdminWatches.bjs
+++ b/Pman.Tab.AdminWatches.bjs
@@ -165,7 +165,7 @@
                             "header": "Watch Event",
                             "width": 150,
                             "xtype": "ColumnModel",
-                            "|renderer": "function(v) { return String.format('{0}', v); }",
+                            "|renderer": "function(v,x,r) { \n    if (typeof(r.data.event_right_display_name) != 'undefined') {\n        return String.format('{0} {1}', r.data.event_left, r.data.event_right_display_name);     \n    }\n    return String.format('{0}', v); \n    \n}",
                             "|xns": "Roo.grid"
                         },
                         {

diff --git a/Pman.Tab.AdminWatches.js b/Pman.Tab.AdminWatches.js
index c66cc2a..62f3091 100644 (file)
--- a/Pman.Tab.AdminWatches.js
+++ b/Pman.Tab.AdminWatches.js
@@ -321,7 +321,13 @@ Pman.Tab.AdminWatches = new Roo.XComponent({
                         dataIndex : 'event',
                         header : 'Watch Event',
                         width : 150,
-                        renderer : function(v) { return String.format('{0}', v); }
+                        renderer : function(v,x,r) { 
+                            if (typeof(r.data.event_right_display_name) != 'undefined') {
+                                return String.format('{0} {1}', r.data.event_left, r.data.event_right_display_name);     
+                            }
+                            return String.format('{0}', v); 
+                            
+                        }
                     },
                     {
                         xtype: 'ColumnModel',