From 41ce600aaa32f5711503a8a553b841758f67a7cc Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Tue, 22 Mar 2016 18:18:02 +0800 Subject: [PATCH] Pman.Tab.AdminNotify.bjs Pman.Tab.AdminNotify.js --- Pman.Tab.AdminNotify.bjs | 2 +- Pman.Tab.AdminNotify.js | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Pman.Tab.AdminNotify.bjs b/Pman.Tab.AdminNotify.bjs index cb1402c..bde4522 100644 --- a/Pman.Tab.AdminNotify.bjs +++ b/Pman.Tab.AdminNotify.bjs @@ -322,7 +322,7 @@ "xtype" : "ColumnModel", "header" : "Who to notify", "width" : 100, - "$ renderer" : "function(v,x,r) {\n\n\n var ecol = r.data.person_table.toLowerCase() + '_id_email' ;\n var ncol = r.data.person_table.toLowerCase() + '_id_name' ;\n return String.format('{0} <{1}>', r.data[ncol], r.data[ecol]); \n }", + "$ renderer" : "function(v,x,r) {\n\n var pt = r.data.person_table.toLowerCase() ;\n var pt = pt.length ? pt : 'person';\n var ecol = pt + '_id_email' ;\n var ncol = pt + '_id_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 6351b57..adf8767 100644 --- a/Pman.Tab.AdminNotify.js +++ b/Pman.Tab.AdminNotify.js @@ -583,9 +583,10 @@ Pman.Tab.AdminNotify = new Roo.XComponent({ header : _this._strings['24463f10155b8af973300f86302c4fde'] /* Who to notify */, renderer : function(v,x,r) { - - var ecol = r.data.person_table.toLowerCase() + '_id_email' ; - var ncol = r.data.person_table.toLowerCase() + '_id_name' ; + var pt = r.data.person_table.toLowerCase() ; + var pt = pt.length ? pt : 'person'; + var ecol = pt + '_id_email' ; + var ncol = pt + '_id_name' ; return String.format('{0} <{1}>', r.data[ncol], r.data[ecol]); }, width : 100, -- 2.39.2