A few pre-submission tweaks

modxcms · Nov 4, 2022 · 02b86b9 · 02b86b9
1 parent 08f8868
commit 02b86b9
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/manager/assets/modext/widgets/core/modx.grid.js b/manager/assets/modext/widgets/core/modx.grid.js
@@ -767,23 +767,27 @@ Ext.extend(MODx.grid.Grid,Ext.grid.EditorGridPanel,{
     ,applyGridFilter: function(cmp, param = 'query') {
         const filterValue = cmp.getValue(),
               store = this.getStore(),
-              urlParams = {
-                  [param]: filterValue
-              }
+              urlParams = {}
         ;
         let tabPanel = this.ownerCt.ownerCt,
             hasParentTabPanel = false,
             parentTabItems,
             activeParentTabIdx
         ;
+        if (!Ext.isEmpty(filterValue)) {
+            urlParams[param] = filterValue;
+        }
         if (param == 'ns') {
             store.baseParams['namespace'] = filterValue;
         } else {
             store.baseParams[param] = filterValue;
         }
         /*
-            If a base class is extended twice, such as the settings class,
+            If there is an additional container in the structure,
             we need to search further for the tabs object...
+
+            NOTE: This may be able to be removed once all grid panels have been
+            updated and their structures have been made consistent with one another
         */
         if (!tabPanel.hasOwnProperty('xtype') || !tabPanel.xtype.includes('tabs')) {
             if (tabPanel.ownerCt && tabPanel.ownerCt.xtype && tabPanel.ownerCt.xtype.includes('tabs')) {

diff --git a/manager/assets/modext/widgets/core/modx.tabs.js b/manager/assets/modext/widgets/core/modx.tabs.js
@@ -34,7 +34,7 @@ MODx.Tabs = function(config) {
                         Only proceed with the clearing process if the tab has changed.
                         This is needed to prevent clearing when a URL has been typed in.
 
-                        Note that currentTab is the previous one being navigated away from
+                        NOTE: The currentTab is the previous one being navigated away from
                     */
                     if (newTab.id != currentTab.id) {
                         const resetVerticalTabPanelFilters = (currentTab.items.items[0] && currentTab.items.items[0].xtype == 'modx-vtabs') || currentTab.ownerCt.xtype == 'modx-vtabs',

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
@@ -95,7 +95,7 @@ MODx.grid.UserGroupResourceGroup = function(config) {
             xtype: 'modx-combo-resourcegroup'
             ,itemId: 'filter-resourceGroup'
             ,emptyText: _('filter_by_resource_group')
-            ,width: 200
+            ,width: 210
             ,allowBlank: true
             ,value: MODx.request.resourceGroup || null
             ,listeners: {

diff --git a/manager/assets/modext/widgets/security/modx.panel.groups.roles.js b/manager/assets/modext/widgets/security/modx.panel.groups.roles.js
@@ -164,7 +164,7 @@ Ext.extend(MODx.panel.GroupsRoles,MODx.FormPanel,{
             userGrid.usergroup = usergroup;
             userGrid.config.usergroup = usergroup;
             userGrid.store.baseParams.usergroup = usergroup;
-            userGrid.clearFilter();
+            userGrid.clearGridFilters('filter-username');
         }
 
     }