From 5939181acd66111c12ed21d0ca2be414033cf195 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Thu, 11 Jun 2015 13:14:28 +0800 Subject: [PATCH] Pman.Tab.AdminNotify.bjs Pman.Tab.AdminNotify.js --- Pman.Tab.AdminNotify.bjs | 2 +- Pman.Tab.AdminNotify.js | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Pman.Tab.AdminNotify.bjs b/Pman.Tab.AdminNotify.bjs index 7237cbd..49d0b68 100644 --- a/Pman.Tab.AdminNotify.bjs +++ b/Pman.Tab.AdminNotify.bjs @@ -322,7 +322,7 @@ "xtype" : "ColumnModel", "width" : 100, "header" : "Who to notify", - "$ renderer" : "function(v,x,r) {\n return String.format('{0} <{1}>', v, r.data.person_id_email); \n }", + "$ renderer" : "function(v,x,r) {\n\n\n var col = r.data.person_table.lower() + '_email' ;\n \n return String.format('{0} <{1}>', v, r.data[col]); \n }", "$ xns" : "Roo.grid", "* prop" : "colModel[]", "dataIndex" : "person_id_name" diff --git a/Pman.Tab.AdminNotify.js b/Pman.Tab.AdminNotify.js index 07ff889..eaac862 100644 --- a/Pman.Tab.AdminNotify.js +++ b/Pman.Tab.AdminNotify.js @@ -576,7 +576,11 @@ Pman.Tab.AdminNotify = new Roo.XComponent({ dataIndex : 'person_id_name', header : _this._strings['24463f10155b8af973300f86302c4fde'], renderer : function(v,x,r) { - return String.format('{0} <{1}>', v, r.data.person_id_email); + + + var col = r.data.person_table.lower() + '_email' ; + + return String.format('{0} <{1}>', v, r.data[col]); }, width : 100, xns : Roo.grid, -- 2.39.2