Update Elements creation

Adds logic to prevent the category request param from interfering with the display of certain grids and their category filtering combo; clarifies what that param signifies in the URL and how it's used

Author: smg6511

Diff for: manager/assets/modext/widgets/core/modx.grid.js

@@ -1292,6 +1292,18 @@ Ext.extend(MODx.grid.Grid,Ext.grid.EditorGridPanel,{
         }
         return config;
     }
+
+    /**
+     * Get the request value for a grid's category filtering. Derives whether the category param is to be applied to a
+     * grid and its category filter based on the existence of the tab param in the GET request. Needed where the same
+     * category processor is used for different purposes within the same editing panel (notably the Template and TV panels).
+     */
+    ,getCategoryFilterValue: () => {
+        if (typeof MODx.request.tab === 'undefined' || typeof MODx.request.category === 'undefined') {
+            return null;
+        }
+        return Math.abs(parseInt(MODx.request.category, 10));
+    }
 });
 
 /* local grid */

Diff for: manager/assets/modext/widgets/element/modx.grid.template.tv.js

@@ -32,7 +32,7 @@ MODx.grid.TemplateTV = function(config = {}) {
             action: 'Element/Template/TemplateVar/GetList',
             template: config.template,
             sort: 'tv_rank',
-            category: MODx.request.category || null
+            category: this.getCategoryFilterValue()
         },
         saveParams: {
             template: config.template
@@ -94,7 +94,7 @@ MODx.grid.TemplateTV = function(config = {}) {
                 xtype: 'modx-combo-category',
                 itemId: 'filter-category',
                 emptyText: _('filter_by_category'),
-                value: MODx.request.category !== 'undefined' ? MODx.request.category : null,
+                value: this.getCategoryFilterValue(),
                 submitValue: false,
                 hiddenName: '',
                 width: 200,

Diff for: manager/assets/modext/widgets/element/modx.grid.tv.template.js

@@ -30,7 +30,7 @@ MODx.grid.TemplateVarTemplate = function(config = {}) {
         baseParams: {
             action: 'Element/TemplateVar/Template/GetList',
             tv: config.tv,
-            category: MODx.request.category || null
+            category: this.getCategoryFilterValue()
         },
         saveParams: {
             tv: config.tv
@@ -68,7 +68,7 @@ MODx.grid.TemplateVarTemplate = function(config = {}) {
                 xtype: 'modx-combo-category',
                 itemId: 'filter-category',
                 emptyText: _('filter_by_category'),
-                value: MODx.request.category !== 'undefined' ? MODx.request.category : null,
+                value: this.getCategoryFilterValue(),
                 submitValue: false,
                 hiddenName: '',
                 width: 200,

Diff for: manager/assets/modext/widgets/element/modx.tree.element.js

@@ -363,8 +363,15 @@ Ext.extend(MODx.tree.Element, MODx.tree.Tree, {
     },
 
     _createElement: function(item, e, t) {
-        const elementIdentifiers = this.extractElementIdentifiersFromActiveNode(this.cm.activeNode);
-        this.redirect(`?a=element/${elementIdentifiers.type}/create&category=${elementIdentifiers.categoryId}`);
+        const
+            elementIdentifiers = this.extractElementIdentifiersFromActiveNode(this.cm.activeNode),
+            { type, categoryId } = elementIdentifiers
+        ;
+        let path = `?a=element/${type}/create`;
+        if (!Ext.isEmpty(categoryId)) {
+            path += `&category=${categoryId}`;
+        }
+        this.redirect(path);
         this.cm.hide();
         return false;
     },