Pre-rebase updates

modxcms · Feb 23, 2024 · 71da7e1 · 71da7e1
1 parent 3f4d345
commit 71da7e1
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 100 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
@@ -114,26 +114,11 @@ MODx.grid.UserGroupCategory = function UserGroupCategory(config = {}) {
                         scope: this
                     }
                 }
-            }, {
-                text: _('filter_clear'),
-                itemId: 'filter-clear',
-                listeners: {
-                    click: {
-                        fn: function() {
-                            this.updateDependentFilter('filter-policy-category', 'category', '', true);
-                            this.updateDependentFilter('filter-category', 'policy', '', true);
-                            this.clearGridFilters('filter-category, filter-policy-category');
-                        },
-                        scope: this
-                    },
-                    mouseout: {
-                        fn: function() {
-                            this.removeClass('x-btn-focus');
-                        }
-                    }
-                },
-                scope: this
-            }
+            },
+            this.getClearFiltersButton(
+                'filter-category, filter-policy-category',
+                'filter-policy-category:category, filter-category:policy'
+            )
         ]
     });
     MODx.grid.UserGroupCategory.superclass.constructor.call(this, config);

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
@@ -108,26 +108,11 @@ MODx.grid.UserGroupContext = function UserGroupContext(config = {}) {
                         scope: this
                     }
                 }
-            }, {
-                text: _('filter_clear'),
-                itemId: 'filter-clear',
-                listeners: {
-                    click: {
-                        fn: function() {
-                            this.updateDependentFilter('filter-policy-context', 'context', '', true);
-                            this.updateDependentFilter('filter-context', 'policy', '', true);
-                            this.clearGridFilters('filter-context, filter-policy-context');
-                        },
-                        scope: this
-                    },
-                    mouseout: {
-                        fn: function() {
-                            this.removeClass('x-btn-focus');
-                        }
-                    }
-                },
-                scope: this
-            }
+            },
+            this.getClearFiltersButton(
+                'filter-context, filter-policy-context',
+                'filter-policy-context:context, filter-context:policy'
+            )
         ]
     });
     MODx.grid.UserGroupContext.superclass.constructor.call(this, config);

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
@@ -113,26 +113,11 @@ MODx.grid.UserGroupNamespace = function UserGroupNamespace(config = {}) {
                         scope: this
                     }
                 }
-            }, {
-                text: _('filter_clear'),
-                itemId: 'filter-clear',
-                listeners: {
-                    click: {
-                        fn: function() {
-                            this.updateDependentFilter('filter-policy-namespace', 'namespace', '', true);
-                            this.updateDependentFilter('filter-namespace', 'policy', '', true);
-                            this.clearGridFilters('filter-namespace, filter-policy-namespace');
-                        },
-                        scope: this
-                    },
-                    mouseout: {
-                        fn: function() {
-                            this.removeClass('x-btn-focus');
-                        }
-                    }
-                },
-                scope: this
-            }
+            },
+            this.getClearFiltersButton(
+                'filter-namespace, filter-policy-namespace',
+                'filter-policy-namespace:namespace, filter-namespace:policy'
+            )
         ]
     });
     MODx.grid.UserGroupNamespace.superclass.constructor.call(this, config);

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
@@ -116,26 +116,11 @@ MODx.grid.UserGroupResourceGroup = function UserGroupResourceGroup(config = {})
                         scope: this
                     }
                 }
-            }, {
-                text: _('filter_clear'),
-                itemId: 'filter-clear',
-                listeners: {
-                    click: {
-                        fn: function() {
-                            this.updateDependentFilter('filter-policy-resourceGroup', 'resourceGroup', '', true);
-                            this.updateDependentFilter('filter-resourceGroup', 'policy', '', true);
-                            this.clearGridFilters('filter-resourceGroup, filter-policy-resourceGroup');
-                        },
-                        scope: this
-                    },
-                    mouseout: {
-                        fn: function() {
-                            this.removeClass('x-btn-focus');
-                        }
-                    }
-                },
-                scope: this
-            }
+            },
+            this.getClearFiltersButton(
+                'filter-resourceGroup, filter-policy-resourceGroup',
+                'filter-policy-resourceGroup:resourceGroup, filter-resourceGroup:policy'
+            )
         ]
     });
     MODx.grid.UserGroupResourceGroup.superclass.constructor.call(this, config);

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
@@ -109,26 +109,11 @@ MODx.grid.UserGroupSource = function UserGroupSource(config = {}) {
                         scope: this
                     }
                 }
-            }, {
-                text: _('filter_clear'),
-                itemId: 'filter-clear',
-                listeners: {
-                    click: {
-                        fn: function() {
-                            this.updateDependentFilter('filter-policy-source', 'source', '', true);
-                            this.updateDependentFilter('filter-source', 'policy', '', true);
-                            this.clearGridFilters('filter-source, filter-policy-source');
-                        },
-                        scope: this
-                    },
-                    mouseout: {
-                        fn: function(evt) {
-                            this.removeClass('x-btn-focus');
-                        }
-                    }
-                },
-                scope: this
-            }
+            },
+            this.getClearFiltersButton(
+                'filter-source, filter-policy-source',
+                'filter-policy-source:source, filter-source:policy'
+            )
         ]
     });
     MODx.grid.UserGroupSource.superclass.constructor.call(this, config);