From 3b6134acc9014ad08e597335a71d989f7e10d900 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Wed, 31 May 2017 12:30:49 +0800 Subject: [PATCH] Pman.Tab.AdminContactsGroup.bjs Pman.Tab.AdminContactsGroup.js --- Pman.Tab.AdminContactsGroup.bjs | 10 +++++----- Pman.Tab.AdminContactsGroup.js | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Pman.Tab.AdminContactsGroup.bjs b/Pman.Tab.AdminContactsGroup.bjs index 3c73884..a11bb7a 100644 --- a/Pman.Tab.AdminContactsGroup.bjs +++ b/Pman.Tab.AdminContactsGroup.bjs @@ -19,9 +19,9 @@ "listeners" : { "|activate" : "function() {\n _this.panel = this;\n if (_this.grid) {\n _this.grid.ds.load({});\n }\n}" }, + "region" : "west", "fitToframe" : true, "background" : true, - "region" : "west", "title" : "Groups", "xtype" : "GridPanel", "fitContainer" : true, @@ -34,8 +34,8 @@ "|render" : "function() \n{\n _this.grid = this; \n _this.dialog = Pman.Dialog.Groups;\n if (_this.panel.active) {\n _this.grid.ds.load({});\n }\n}" }, "autoExpandColumn" : "name", - "enableDrop" : true, "xtype" : "Grid", + "enableDrop" : true, "ddGroup" : "groupDD", "loadMask" : true, "$ xns" : "Roo.grid", @@ -54,8 +54,8 @@ "items" : [ { "$ url" : "baseURL + '/Roo/core_group'", - "method" : "GET", "xtype" : "HttpProxy", + "method" : "GET", "$ xns" : "Roo.data", "* prop" : "proxy" }, @@ -107,7 +107,7 @@ }, { "listeners" : { - "|click" : "function()\n{\n Pman.genericDelete(_this, 'Groups'); \n}\n " + "|click" : "function()\n{\n Pman.genericDelete(_this, 'core_group'); \n}\n " }, "text" : "Delete", "xtype" : "Item", @@ -135,8 +135,8 @@ }, { "xtype" : "ColumnModel", - "header" : "Name", "width" : 200, + "header" : "Name", "$ renderer" : "function(v,x,r) { \n if (r.data.id == -1) {\n return '' + \"Not in a Group\" + '';\n }\n if ((r.data.id == 0) && (_this.type == 0)) {\n return '' + \"All Staff (Default Permissions)\" + '';\n }\n if ((r.data.id == 0) && (_this.type == 2)) {\n return '' + \"Everybody\" + '';\n }\n if (r.data.id == 0) {\n return '' + \"All Staff\" + '';\n }\n if (v == 'Administrators') {\n return '' + \"Adminstrators\" + '';\n }\n if (r.data.leader) {\n return v + ' (' + r.data.leader_name + ')';\n }\n \n return v;\n}", "$ xns" : "Roo.grid", "* prop" : "colModel[]", diff --git a/Pman.Tab.AdminContactsGroup.js b/Pman.Tab.AdminContactsGroup.js index 95f1d88..db5bb5f 100644 --- a/Pman.Tab.AdminContactsGroup.js +++ b/Pman.Tab.AdminContactsGroup.js @@ -146,7 +146,7 @@ Pman.Tab.AdminContactsGroup = new Roo.XComponent({ listeners : { click : function() { - Pman.genericDelete(_this, 'Groups'); + Pman.genericDelete(_this, 'core_group'); } }, xns : Roo.menu, -- 2.39.2