From 379e00a4778bd2b73f8120317f6095511b5992ea Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Fri, 17 Jan 2014 15:36:08 +0800 Subject: [PATCH] Pman.Tab.AdminNotify.bjs Pman.Tab.AdminNotify.js --- Pman.Tab.AdminNotify.bjs | 2 +- Pman.Tab.AdminNotify.js | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Pman.Tab.AdminNotify.bjs b/Pman.Tab.AdminNotify.bjs index d107577..ac279dc 100644 --- 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} <{1}>', 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 --- 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} <{1}>', 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 + ); } }, { -- 2.39.2