From b9ecaf2ab2541adcae1441efe3e0b3e7e0247829 Mon Sep 17 00:00:00 2001 From: Edward Date: Thu, 18 Dec 2014 12:19:36 +0800 Subject: [PATCH] Pman.Tab.AdminLogEvents.bjs Pman.Tab.AdminLogEvents.js --- Pman.Tab.AdminLogEvents.bjs | 2 +- Pman.Tab.AdminLogEvents.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Pman.Tab.AdminLogEvents.bjs b/Pman.Tab.AdminLogEvents.bjs index 3ca868e..da92e71 100644 --- a/Pman.Tab.AdminLogEvents.bjs +++ b/Pman.Tab.AdminLogEvents.bjs @@ -380,7 +380,7 @@ "xtype" : "ColumnModel", "header" : "Staff", "width" : 150, - "$ renderer" : "function(v,x,r) { \n \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 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}", "$ xns" : "Roo.grid", "* prop" : "colModel[]", "dataIndex" : "person_id_name" diff --git a/Pman.Tab.AdminLogEvents.js b/Pman.Tab.AdminLogEvents.js index 27e5d59..ea86124 100644 --- a/Pman.Tab.AdminLogEvents.js +++ b/Pman.Tab.AdminLogEvents.js @@ -1240,7 +1240,7 @@ Pman.Tab.AdminLogEvents = new Roo.XComponent({ 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; - Roo.log([r, efield, nfield]); + //Roo.log([r, efield, nfield]); var email = r.json[efield]; // ? r.data.person_id_email : r.data.person_id_email; var name = r.json[nfield]; // ? r.data.person_id_name : r.data.person_id_name; -- 2.39.2