From b219a382bbce4337616a3f868a926b0f7c1334bd Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Tue, 29 Dec 2020 17:18:40 +0800 Subject: [PATCH] Uncommited changes synced --- Pman.Tab.AdminContacts.bjs | 20 ++++++++++---------- Pman.Tab.AdminContacts.js | 2 +- Pman.Tab.AdminContactsManager.bjs | 6 +++--- Pman.Tab.AdminContactsManager.js | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Pman.Tab.AdminContacts.bjs b/Pman.Tab.AdminContacts.bjs index 4aa1d91..1c947d4 100644 --- a/Pman.Tab.AdminContacts.bjs +++ b/Pman.Tab.AdminContacts.bjs @@ -2,7 +2,7 @@ "name" : "Pman.Tab.AdminContacts", "parent" : "Pman.Tab.AdminContactsManager", "title" : "Pman.Tab.AdminContacts", - "path" : "/home/edward/gitlive/Pman.Admin/Pman.Tab.AdminContacts.bjs", + "path" : "/home/alan/gitlive/Pman.Admin/Pman.Tab.AdminContacts.bjs", "permname" : "Core.Person", "modOrder" : "001", "strings" : { @@ -54,8 +54,8 @@ { "listeners" : { "|rowdblclick" : "function (_self, rowIndex, e)\n{\n if (!_this.dialog) {\n return;\n }\n _this.dialog.show( this.getDataSource().getAt(rowIndex), function() {\n _this.grid.footer.onClick('first');\n }); \n}\n", - "|render" : "function() \n{\n _this.grid = this; \n if (!_this.dialog) {\n _this.dialog = Pman.Dialog.PersonEdit;\n \n }\n //_this.dialog = Pman.Dialog.FILL_IN\n if (_this.panel.active) {\n this.footer.onClick('first');\n }\n}", - "cellclick" : "function (_self, rowIndex, columnIndex, e)\n{\n\n var di = this.colModel.getDataIndex(columnIndex);\n if (di != 'active') {\n return;\n }\n \n var rec = _this.grid.ds.getAt(rowIndex);\n \n rec.set('active', rec.data.active ? 0 : 1);\n rec.commit();\n \n \n}" + "cellclick" : "function (_self, rowIndex, columnIndex, e)\n{\n\n var di = this.colModel.getDataIndex(columnIndex);\n if (di != 'active') {\n return;\n }\n \n var rec = _this.grid.ds.getAt(rowIndex);\n \n rec.set('active', rec.data.active ? 0 : 1);\n rec.commit();\n \n \n}", + "|render" : "function() \n{\n _this.grid = this; \n if (!_this.dialog) {\n _this.dialog = Pman.Dialog.PersonEdit;\n \n }\n //_this.dialog = Pman.Dialog.FILL_IN\n if (_this.panel.active) {\n this.footer.onClick('first');\n }\n}" }, "autoExpandColumn" : "name", "xtype" : "Grid", @@ -77,9 +77,9 @@ "* prop" : "dataSource", "items" : [ { - "$ url" : "baseURL + '/Roo/Person.php'", - "xtype" : "HttpProxy", + "$ url" : "baseURL + '/Roo/core_person'", "method" : "GET", + "xtype" : "HttpProxy", "$ xns" : "Roo.data", "* prop" : "proxy" }, @@ -166,8 +166,8 @@ "items" : [ { "$ url" : "baseURL + '/Roo/core_company'", - "xtype" : "HttpProxy", "method" : "GET", + "xtype" : "HttpProxy", "$ xns" : "Roo.data", "* prop" : "proxy" }, @@ -319,8 +319,8 @@ }, { "xtype" : "ColumnModel", - "width" : 100, "header" : "Role", + "width" : 100, "$ renderer" : "function(v) { return String.format('{0}', v); }", "$ xns" : "Roo.grid", "* prop" : "colModel[]", @@ -328,8 +328,8 @@ }, { "xtype" : "ColumnModel", - "width" : 100, "header" : "Phone", + "width" : 100, "$ renderer" : "function(v) { return String.format('{0}', v); }", "$ xns" : "Roo.grid", "* prop" : "colModel[]", @@ -337,8 +337,8 @@ }, { "xtype" : "ColumnModel", - "width" : 100, "header" : "Fax", + "width" : 100, "$ renderer" : "function(v) { return String.format('{0}', v); }", "$ xns" : "Roo.grid", "* prop" : "colModel[]", @@ -356,8 +356,8 @@ }, { "xtype" : "ColumnModel", - "width" : 75, "header" : "Active", + "width" : 75, "$ renderer" : "function(v) { \n var state = v> 0 ? '-checked' : '';\n\n return '';\n \n }", "$ xns" : "Roo.grid", "* prop" : "colModel[]", diff --git a/Pman.Tab.AdminContacts.js b/Pman.Tab.AdminContacts.js index 43c4032..8d37e53 100644 --- a/Pman.Tab.AdminContacts.js +++ b/Pman.Tab.AdminContacts.js @@ -504,7 +504,7 @@ Pman.Tab.AdminContacts = new Roo.XComponent({ proxy : { xtype : 'HttpProxy', method : 'GET', - url : baseURL + '/Roo/Person.php', + url : baseURL + '/Roo/core_person', xns : Roo.data, '|xns' : 'Roo.data' }, diff --git a/Pman.Tab.AdminContactsManager.bjs b/Pman.Tab.AdminContactsManager.bjs index f3facd6..1ac41d6 100644 --- a/Pman.Tab.AdminContactsManager.bjs +++ b/Pman.Tab.AdminContactsManager.bjs @@ -2,7 +2,7 @@ "name" : "Pman.Tab.AdminContactsManager", "parent" : "Pman.Tab.Admin", "title" : "Pman.Tab.AdminContactsManager", - "path" : "/home/edward/gitlive/Pman.Admin/Pman.Tab.AdminContactsManager.bjs", + "path" : "/home/alan/gitlive/Pman.Admin/Pman.Tab.AdminContactsManager.bjs", "permname" : "Core.Person", "modOrder" : "060", "strings" : { @@ -23,16 +23,16 @@ "items" : [ { "xtype" : "LayoutRegion", - "tabPosition" : "top", "width" : 250, + "tabPosition" : "top", "$ xns" : "Roo", "split" : true, "* prop" : "west" }, { "xtype" : "LayoutRegion", - "tabPosition" : "top", "$ xns" : "Roo", + "tabPosition" : "top", "* prop" : "center" } ] diff --git a/Pman.Tab.AdminContactsManager.js b/Pman.Tab.AdminContactsManager.js index faf7c9d..61e0202 100644 --- a/Pman.Tab.AdminContactsManager.js +++ b/Pman.Tab.AdminContactsManager.js @@ -17,7 +17,7 @@ Pman.Tab.AdminContactsManager = new Roo.XComponent({ name : "Pman.Tab.AdminContactsManager", disabled : false, permname : 'Core.Person', - _tree : function() + _tree : function(_data) { var _this = this; var MODULE = this; -- 2.39.2