From 3dfbac52f290c274c620351ccaffd326be160000 Mon Sep 17 00:00:00 2001 From: Edward Date: Thu, 30 Apr 2015 13:22:25 +0800 Subject: [PATCH] Pman.Tab.AdminLogEvents.bjs Pman.Tab.AdminLogEvents.js --- Pman.Tab.AdminLogEvents.bjs | 2 +- Pman.Tab.AdminLogEvents.js | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Pman.Tab.AdminLogEvents.bjs b/Pman.Tab.AdminLogEvents.bjs index af71fb0..0660256 100644 --- a/Pman.Tab.AdminLogEvents.bjs +++ b/Pman.Tab.AdminLogEvents.bjs @@ -399,7 +399,7 @@ "xtype" : "ColumnModel", "width" : 150, "header" : "Person", - "$ renderer" : "function(v,x,r) { \n \n Roo.log(_this.tableSel.getValue());\n var efield = typeof(_this.email_field) == 'undefined' ? 'person_id_email' : _this.email_field;\n var nfield = typeof(_this.name_field) == 'undefined' ? 'person_id_name' : _this.name_field; \n\n //Roo.log([r, efield, nfield]);\n \n var email = r.json[efield]; // ? r.data.person_id_email : r.data.person_id_email;\n var name = r.json[nfield]; // ? r.data.person_id_name : r.data.person_id_name; \n return String.format('{0} <{1}>', \n name, email); \n\n\n}", + "$ renderer" : "function(v,x,r) { \n \n var ptable = _this.tableSel.getValue();\n \n var efield = 'person_id_email';\n var nfield = 'person_id_name'; \n \n if(ptable.length && ptable != 'Person'){\n efield = ptable + '_id_email';\n nfield = ptable + '_id_name'; \n }\n \n //Roo.log([r, efield, nfield]);\n \n var email = r.data[efield]; // ? r.data.person_id_email : r.data.person_id_email;\n var name = r.data[nfield]; // ? r.data.person_id_name : r.data.person_id_name; \n return String.format('{0} <{1}>', \n name, email); \n\n\n}", "$ xns" : "Roo.grid", "* prop" : "colModel[]", "dataIndex" : "person_id_name" diff --git a/Pman.Tab.AdminLogEvents.js b/Pman.Tab.AdminLogEvents.js index 9a63358..47d4d70 100644 --- a/Pman.Tab.AdminLogEvents.js +++ b/Pman.Tab.AdminLogEvents.js @@ -1271,10 +1271,16 @@ Pman.Tab.AdminLogEvents = new Roo.XComponent({ header : _this._strings['40bed7cf9b3d4bb3a3d7a7e3eb18c5eb'], renderer : function(v,x,r) { - Roo.log(_this.tableSel.getValue()); - var efield = typeof(_this.email_field) == 'undefined' ? 'person_id_email' : _this.email_field; - var nfield = typeof(_this.name_field) == 'undefined' ? 'person_id_name' : _this.name_field; - + var ptable = _this.tableSel.getValue(); + + var efield = 'person_id_email'; + var nfield = 'person_id_name'; + + if(ptable.length && ptable != 'Person'){ + efield = ptable + '_id_email'; + nfield = ptable + '_id_name'; + } + //Roo.log([r, efield, nfield]); var email = r.json[efield]; // ? r.data.person_id_email : r.data.person_id_email; -- 2.39.2