From 9ac20b08da62786e7728fda454b7b0eea9560c4a Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 12 Sep 2012 15:01:19 +0800 Subject: [PATCH] Pman.Tab.AdminCompanies.bjs Pman.Tab.AdminCompanies.js --- Pman.Tab.AdminCompanies.bjs | 6 ++--- Pman.Tab.AdminCompanies.js | 45 ++++++++++++------------------------- 2 files changed, 17 insertions(+), 34 deletions(-) diff --git a/Pman.Tab.AdminCompanies.bjs b/Pman.Tab.AdminCompanies.bjs index 95ff75a..6973b3c 100644 --- a/Pman.Tab.AdminCompanies.bjs +++ b/Pman.Tab.AdminCompanies.bjs @@ -1,9 +1,9 @@ { - "id": "roo-file-46", + "id": "roo-file-117", "name": "Pman.Tab.AdminCompanies", "parent": "Pman.Tab.Admin", "title": "Pman.Tab.AdminCompanies", - "path": "/home/alan/gitlive/Pman.Admin/Pman.Tab.AdminCompanies.bjs", + "path": "/home/chris/gitlive/Pman.Admin/Pman.Tab.AdminCompanies.bjs", "items": [ { "region": "center", @@ -170,7 +170,7 @@ "sortable": true, "width": 90, "xtype": "ColumnModel", - "|renderer": "function (v,x ,r) {\n return Pman.Dialog.Companies.comptypeListToString(r.data.isOwner ? 'OWNER' : v);\n}", + "|renderer": "function (v,x ,r) {\n //return Pman.Dialog.Companies.comptypeListToString(r.data.isOwner ? 'OWNER' : v);\n return v;\n}", "|xns": "Roo.grid" }, { diff --git a/Pman.Tab.AdminCompanies.js b/Pman.Tab.AdminCompanies.js index 0f29910..b113cdd 100644 --- a/Pman.Tab.AdminCompanies.js +++ b/Pman.Tab.AdminCompanies.js @@ -2,35 +2,19 @@ // Auto generated file - created by app.Builder.js- do not edit directly (at present!) - - -// register the module first -Pman.on('beforeload', function() -{ - Pman.register({ - modKey : '030-Pman.Tab.AdminCompanies', - module : Pman.Tab.AdminCompanies, - region : 'center', - parent : Pman.Tab.Admin, - name : "Pman.Tab.AdminCompanies", - disabled : false, - permname: 'Admin.Companies' - }); -}); - -Pman.Tab.AdminCompanies = new Roo.util.Observable({ - - panel : false, - disabled : false, - parentLayout: false, - - add : function(parentLayout, region) +Pman.Tab.AdminCompanies = new Roo.XComponent({ + part : ["Admin","Companies"], + order : '030-Pman.Tab.AdminCompanies', + region : 'center', + parent : 'Pman.Tab.Admin', + name : "Pman.Tab.AdminCompanies", + disabled : false, + permname : 'Admin.Companies', + _tree : function() { - var _this = this; - this.parentLayout = parentLayout; - - this.panel = parentLayout.addxtype({ + var MODULE = this; + return { xtype: 'NestedLayoutPanel', xns: Roo, region : 'center', @@ -511,7 +495,8 @@ Pman.Tab.AdminCompanies = new Roo.util.Observable({ sortable : true, width : 90, renderer : function (v,x ,r) { - return Pman.Dialog.Companies.comptypeListToString(r.data.isOwner ? 'OWNER' : v); + //return Pman.Dialog.Companies.comptypeListToString(r.data.isOwner ? 'OWNER' : v); + return v; } }, { @@ -596,8 +581,6 @@ Pman.Tab.AdminCompanies = new Roo.util.Observable({ titlebar : true } } - }); - this.layout = this.panel.layout; - + }; } }); -- 2.39.2