From d6b3bda559725039955f1f64f6474e5a0ee3883a Mon Sep 17 00:00:00 2001 From: Jim Graham Date: Tue, 12 Sep 2023 22:23:53 -0400 Subject: [PATCH] ACLs - User Group Permissions fixes Fixes to address PR review issues --- .../security/modx.grid.user.group.category.js | 4 +-- .../security/modx.grid.user.group.context.js | 7 ++--- .../modx.grid.user.group.namespace.js | 26 +++++++++---------- .../security/modx.grid.user.group.resource.js | 4 +-- .../security/modx.grid.user.group.source.js | 4 +-- 5 files changed, 21 insertions(+), 24 deletions(-) diff --git a/manager/assets/modext/widgets/security/modx.grid.user.group.category.js b/manager/assets/modext/widgets/security/modx.grid.user.group.category.js index a21d6ad2808..74a87aec28a 100644 --- a/manager/assets/modext/widgets/security/modx.grid.user.group.category.js +++ b/manager/assets/modext/widgets/security/modx.grid.user.group.category.js @@ -17,7 +17,7 @@ MODx.grid.UserGroupCategory = function(config = {}) { action: 'Security/Access/UserGroup/Category/GetList' ,usergroup: config.usergroup ,category: MODx.request.category || null - ,policy: MODx.request.policy || null + ,policy: this.applyRequestFilter(2) } ,fields: [ 'id', @@ -109,7 +109,7 @@ MODx.grid.UserGroupCategory = function(config = {}) { ,emptyText: _('filter_by_policy') ,width: 180 ,allowBlank: true - ,value: MODx.request.policy || null + ,value: this.applyRequestFilter(2) ,baseParams: { action: 'Security/Access/Policy/GetList', group: 'Element,Object', diff --git a/manager/assets/modext/widgets/security/modx.grid.user.group.context.js b/manager/assets/modext/widgets/security/modx.grid.user.group.context.js index 9adffa56c0b..fe6398cf10d 100644 --- a/manager/assets/modext/widgets/security/modx.grid.user.group.context.js +++ b/manager/assets/modext/widgets/security/modx.grid.user.group.context.js @@ -18,7 +18,7 @@ MODx.grid.UserGroupContext = function(config) { action: 'Security/Access/UserGroup/Context/GetList' ,usergroup: config.usergroup ,context: MODx.request.context || null - ,policy: MODx.request.policy || null + ,policy: this.applyRequestFilter(0) } ,fields: [ 'id', @@ -46,7 +46,6 @@ MODx.grid.UserGroupContext = function(config) { { header: _('context') ,dataIndex: 'target' - ,width: 120 ,sortable: true ,xtype: 'templatecolumn' ,tpl: this.getLinkTemplate('context/update', 'target', { @@ -55,13 +54,11 @@ MODx.grid.UserGroupContext = function(config) { },{ header: _('minimum_role') ,dataIndex: 'authority_name' - ,width: 100 ,xtype: 'templatecolumn' ,tpl: this.getLinkTemplate('security/permission', 'authority_name') },{ header: _('policy') ,dataIndex: 'policy_name' - ,width: 200 ,sortable: true ,xtype: 'templatecolumn' ,tpl: this.getLinkTemplate('security/access/policy/update', 'policy_name', { @@ -105,7 +102,7 @@ MODx.grid.UserGroupContext = function(config) { ,emptyText: _('filter_by_policy') ,width: 180 ,allowBlank: true - ,value: MODx.request.policy || null + ,value: this.applyRequestFilter(0) ,baseParams: { action: 'Security/Access/Policy/GetList', group: 'Administrator,Context,Object', diff --git a/manager/assets/modext/widgets/security/modx.grid.user.group.namespace.js b/manager/assets/modext/widgets/security/modx.grid.user.group.namespace.js index b526e308741..d2abd6d63da 100644 --- a/manager/assets/modext/widgets/security/modx.grid.user.group.namespace.js +++ b/manager/assets/modext/widgets/security/modx.grid.user.group.namespace.js @@ -17,21 +17,21 @@ MODx.grid.UserGroupNamespace = function(config) { ,baseParams: { action: 'Security/Access/UserGroup/AccessNamespace/GetList' ,usergroup: config.usergroup - ,namespace: MODx.request.ns || null - ,policy: MODx.request.policy || null + ,namespace: this.applyRequestFilter(4, 'ns') + ,policy: this.applyRequestFilter(4) } ,fields: [ 'id', - 'target', - 'name', - 'principal', - 'authority', - 'authority_name', + 'target', + 'name', + 'principal', + 'authority', + 'authority_name', 'policy', 'policy_name', 'context_key', - 'permissions', - 'cls' + 'permissions', + 'cls' ] ,paging: true ,hideMode: 'offsets' @@ -83,7 +83,7 @@ MODx.grid.UserGroupNamespace = function(config) { ,editable: false ,width: 200 ,allowBlank: true - ,value: MODx.request.ns || null + ,value: this.applyRequestFilter(4, 'ns') ,baseParams: { action: 'Workspace/PackageNamespace/GetList', isGridFilter: true, @@ -96,8 +96,8 @@ MODx.grid.UserGroupNamespace = function(config) { this.updateDependentFilter('filter-policy-namespace', 'namespace', record.data.name); /* There's an odd conflict in the processor when using 'namespace' as the - query param, therefor the alternate param 'ns' is used this listener, its component value, and in the value of - this grid's main baseParams config + query param, therefor the alternate param 'ns' is used for this listener, its component value, + and in the value of this grid's main baseParams config */ this.applyGridFilter(cmp, 'ns'); }, @@ -110,7 +110,7 @@ MODx.grid.UserGroupNamespace = function(config) { ,emptyText: _('filter_by_policy') ,width: 180 ,allowBlank: true - ,value: MODx.request.policy || null + ,value: this.applyRequestFilter(4) ,baseParams: { action: 'Security/Access/Policy/GetList', group: 'Namespace', diff --git a/manager/assets/modext/widgets/security/modx.grid.user.group.resource.js b/manager/assets/modext/widgets/security/modx.grid.user.group.resource.js index 788048fbb23..3802cba4ffa 100644 --- a/manager/assets/modext/widgets/security/modx.grid.user.group.resource.js +++ b/manager/assets/modext/widgets/security/modx.grid.user.group.resource.js @@ -18,7 +18,7 @@ MODx.grid.UserGroupResourceGroup = function(config) { action: 'Security/Access/UserGroup/ResourceGroup/GetList' ,usergroup: config.usergroup ,resourceGroup: MODx.request.resourceGroup || null - ,policy: MODx.request.policy || null + ,policy: this.applyRequestFilter(1) } ,fields: [ 'id', @@ -112,7 +112,7 @@ MODx.grid.UserGroupResourceGroup = function(config) { ,emptyText: _('filter_by_policy') ,width: 180 ,allowBlank: true - ,value: MODx.request.policy || null + ,value: this.applyRequestFilter(1) ,baseParams: { action: 'Security/Access/Policy/GetList', group: 'Resource,Object', diff --git a/manager/assets/modext/widgets/security/modx.grid.user.group.source.js b/manager/assets/modext/widgets/security/modx.grid.user.group.source.js index 46efb9bdcdc..75e4a4b91a9 100644 --- a/manager/assets/modext/widgets/security/modx.grid.user.group.source.js +++ b/manager/assets/modext/widgets/security/modx.grid.user.group.source.js @@ -18,7 +18,7 @@ MODx.grid.UserGroupSource = function(config) { action: 'Security/Access/UserGroup/Source/GetList' ,usergroup: config.usergroup ,source: MODx.request.source || null - ,policy: MODx.request.policy || null + ,policy: this.applyRequestFilter(3) } ,fields: [ 'id', @@ -105,7 +105,7 @@ MODx.grid.UserGroupSource = function(config) { ,emptyText: _('filter_by_policy') ,width: 180 ,allowBlank: true - ,value: MODx.request.policy || null + ,value: this.applyRequestFilter(3) ,baseParams: { action: 'Security/Access/Policy/GetList', group: 'MediaSource',