Pman.Tab.AdminNotify.bjs

Pman.Tab.AdminNotify.js

diff --git a/Pman.Tab.AdminNotify.bjs b/Pman.Tab.AdminNotify.bjs
index d107577..ac279dc 100644 (file)
--- a/Pman.Tab.AdminNotify.bjs
+++ b/Pman.Tab.AdminNotify.bjs
@@ -213,7 +213,7 @@
                             "header": "Triggered by",
                             "width": 100,
                             "xtype": "ColumnModel",
-                            "|renderer": "function(v,x,r) {\n     return String.format('{0} <u>&lt;{1}&gt;</u>', v, r.data.person_id_email); \n }",
+                            "|renderer": "function(v,x,r) {\n     return String.format(\n            '{0} : {1} {2}', \n            r.data.trigger_event_id_on_table, \n            r.data.trigger_event_id_on_id, \n            r.data.trigger_event_id_remarks\n        ); \n }",
                             "|xns": "Roo.grid"
                         },
                         {

diff --git a/Pman.Tab.AdminNotify.js b/Pman.Tab.AdminNotify.js
index bc8a671..a63e9c4 100644 (file)
--- a/Pman.Tab.AdminNotify.js
+++ b/Pman.Tab.AdminNotify.js
@@ -392,7 +392,12 @@ Pman.Tab.AdminNotify = new Roo.XComponent({
                         header : 'Triggered by',
                         width : 100,
                         renderer : function(v,x,r) {
-                             return String.format('{0} <u>&lt;{1}&gt;</u>', v, r.data.person_id_email); 
+                             return String.format(
+                                    '{0} : {1} {2}', 
+                                    r.data.trigger_event_id_on_table, 
+                                    r.data.trigger_event_id_on_id, 
+                                    r.data.trigger_event_id_remarks
+                                ); 
                          }
                     },
                     {