From 32eec6309f309798f5267e662f5c9a63bf125704 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Thu, 11 Jun 2015 13:15:03 +0800 Subject: [PATCH] Pman.Tab.AdminNotify.bjs Pman.Tab.AdminNotify.js --- Pman.Tab.AdminNotify.bjs | 2 +- Pman.Tab.AdminNotify.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Pman.Tab.AdminNotify.bjs b/Pman.Tab.AdminNotify.bjs index 49d0b68..ddc5503 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\n\n var col = r.data.person_table.lower() + '_email' ;\n \n return String.format('{0} <{1}>', v, r.data[col]); \n }", + "$ renderer" : "function(v,x,r) {\n\n\n var ecol = r.data.person_table.lower() + '_email' ;\n var ncol = r.data.person_table.lower() + '_name' ;\n return String.format('{0} <{1}>', r.data[ncol], r.data[ecol]); \n }", "$ xns" : "Roo.grid", "* prop" : "colModel[]", "dataIndex" : "person_id_name" diff --git a/Pman.Tab.AdminNotify.js b/Pman.Tab.AdminNotify.js index eaac862..e3cc10c 100644 --- a/Pman.Tab.AdminNotify.js +++ b/Pman.Tab.AdminNotify.js @@ -578,9 +578,9 @@ Pman.Tab.AdminNotify = new Roo.XComponent({ renderer : function(v,x,r) { - var col = r.data.person_table.lower() + '_email' ; - - return String.format('{0} <{1}>', v, r.data[col]); + var ecol = r.data.person_table.lower() + '_email' ; + var ncol = r.data.person_table.lower() + '_name' ; + return String.format('{0} <{1}>', r.data[ncol], r.data[ecol]); }, width : 100, xns : Roo.grid, -- 2.39.2