From 956aa0a9865cbc532bee9b548741bec723ca556a Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Tue, 3 Sep 2019 17:37:06 +0800 Subject: [PATCH] Fix #6027 - group memberships on users list --- Pman.Tab.AdminEnum.bjs | 26 +++++++++++++------------- Pman.Tab.Group_Members.js | 2 ++ 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Pman.Tab.AdminEnum.bjs b/Pman.Tab.AdminEnum.bjs index 700c9cb..bc8818a 100644 --- a/Pman.Tab.AdminEnum.bjs +++ b/Pman.Tab.AdminEnum.bjs @@ -2,7 +2,7 @@ "name" : "Pman.Tab.AdminEnum", "parent" : "Pman.Tab.Admin", "title" : "Pman.Tab.AdminEnum", - "path" : "/home/edward/gitlive/Pman.Admin/Pman.Tab.AdminEnum.bjs", + "path" : "/home/alan/gitlive/Pman.Admin/Pman.Tab.AdminEnum.bjs", "permname" : "", "modOrder" : "500", "strings" : { @@ -32,8 +32,8 @@ "items" : [ { "xtype" : "NestedLayoutPanel", - "String region" : "center", "$ xns" : "Roo", + "String region" : "center", "String title" : "Pulldown Options", "items" : [ { @@ -67,8 +67,8 @@ { "listeners" : { "beforeedit" : "function (e)\n{\n if(e.field == 'name' && e.record.data.is_system_enum*1 == 1){\n return false;\n }\n}", - "|render" : "function() \n{\n _this.egrid = this; \n //_this.dialog = Pman.Dialog.FILL_IN\n if (_this.epanel.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}", + "|render" : "function() \n{\n _this.egrid = this; \n //_this.dialog = Pman.Dialog.FILL_IN\n if (_this.epanel.active) {\n this.footer.onClick('first');\n }\n}", "celldblclick" : "function (_self, rowIndex, columnIndex, e)\n{\n var rec = _this.egrid.ds.getAt(rowIndex);\n Pman.Dialog.AdminEnumType.show(rec.data,function(){\n \n _this.egrid.footer.onClick('first');\n });\n}", "afteredit" : "function (e)\n{\n e.record.commit(); \n}" }, @@ -92,8 +92,8 @@ "items" : [ { "$ url" : "baseURL + '/Roo/core_enum.php'", - "method" : "GET", "xtype" : "HttpProxy", + "method" : "GET", "$ xns" : "Roo.data", "* prop" : "proxy" }, @@ -144,8 +144,8 @@ }, { "xtype" : "ColumnModel", - "width" : 200, "header" : "Pulldown", + "width" : 200, "$ renderer" : "function(v,x,r) { \n\n\n return String.format('{0}', (''+v).length ? v : r.data.name, r.data.name); \n}", "$ xns" : "Roo.grid", "* prop" : "colModel[]", @@ -153,8 +153,8 @@ }, { "xtype" : "ColumnModel", - "width" : 50, "header" : "Active", + "width" : 50, "$ renderer" : "function(v) { \n var state = v> 0 ? '-checked' : '';\n\n return '';\n \n }", "$ xns" : "Roo.grid", "* prop" : "colModel[]", @@ -168,9 +168,9 @@ "listeners" : { "|activate" : "function() {\n _this.panel = this;\n if (_this.grid) {\n _this.grid.footer.onClick('first');\n }\n}" }, + "fitToframe" : true, "background" : false, "region" : "center", - "fitToframe" : true, "title" : "Pulldown Options", "xtype" : "GridPanel", "$ xns" : "Roo", @@ -204,8 +204,8 @@ "items" : [ { "$ url" : "baseURL + '/Roo/core_enum.php'", - "xtype" : "HttpProxy", "method" : "GET", + "xtype" : "HttpProxy", "$ xns" : "Roo.data", "* prop" : "proxy" }, @@ -331,8 +331,8 @@ }, { "xtype" : "ColumnModel", - "header" : "Internal #", "width" : 75, + "header" : "Internal #", "$ renderer" : "function(v,x,r) { \n var fmt = '{0}';\n if (r.selected) {\n fmt = '{0}';\n }\n return String.format(fmt, v); }", "$ xns" : "Roo.grid", "Boolean sortable" : true, @@ -341,8 +341,8 @@ }, { "xtype" : "ColumnModel", - "header" : "Image", "width" : 75, + "header" : "Image", "$ renderer" : "function(v,x,r) { return String.format('', baseURL, v, r.data.images_id_filename); }", "$ xns" : "Roo.grid", "* prop" : "colModel[]", @@ -350,8 +350,8 @@ }, { "xtype" : "ColumnModel", - "width" : 200, "header" : "Name", + "width" : 200, "$ renderer" : "function(v) { return String.format('{0}', v); }", "$ xns" : "Roo.grid", "Boolean sortable" : true, @@ -374,8 +374,8 @@ }, { "xtype" : "ColumnModel", - "header" : "Display Name", "width" : 200, + "header" : "Display Name", "$ renderer" : "function(v) { return String.format('{0}', v); }", "$ xns" : "Roo.grid", "Boolean sortable" : true, @@ -398,8 +398,8 @@ }, { "xtype" : "ColumnModel", - "header" : "Active", "width" : 75, + "header" : "Active", "$ renderer" : "function(v) { \n var state = v> 0 ? '-checked' : '';\n\n return '';\n \n }", "$ xns" : "Roo.grid", "Boolean sortable" : true, diff --git a/Pman.Tab.Group_Members.js b/Pman.Tab.Group_Members.js index 61de6d3..f30f4db 100644 --- a/Pman.Tab.Group_Members.js +++ b/Pman.Tab.Group_Members.js @@ -45,6 +45,7 @@ Pman.Tab.Group_Members = new Pman.Tab.PersonList({ o.params['query[person_internal_only_all]'] = 1; o.params['query[person_inactive]'] = this.showInActive ? 0 : 1; o.params.company_id_comptype = 'OWNER'; + o.params._with_group_membership = 1; }, @@ -54,6 +55,7 @@ Pman.Tab.Group_Members = new Pman.Tab.PersonList({ this.c_name(), this.c_office_id_name(), this.c_role(), + this.c_group_membership(), this.c_phone(), this.c_fax(), this.c_email(), -- 2.39.2