From 47f6a8266dd0ead24e218df6517a25c1aafe964d Mon Sep 17 00:00:00 2001 From: Oliver Date: Thu, 4 Nov 2021 15:08:22 +1100 Subject: [PATCH] Fix for tree-view - Force "cascade" to be set --- InvenTree/templates/js/translated/part.js | 9 +++++++-- InvenTree/templates/js/translated/stock.js | 8 ++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/InvenTree/templates/js/translated/part.js b/InvenTree/templates/js/translated/part.js index e00f04aebd..742083bbe4 100644 --- a/InvenTree/templates/js/translated/part.js +++ b/InvenTree/templates/js/translated/part.js @@ -1159,6 +1159,13 @@ function loadPartCategoryTable(table, options) { filters = loadTableFilters(filterKey); } + + var tree_view = options.allowTreeView && inventreeLoad('category-tree-view') == 1; + + if (tree_view) { + params.cascade = true; + } + var original = {}; for (var key in params) { @@ -1168,8 +1175,6 @@ function loadPartCategoryTable(table, options) { setupFilterList(filterKey, table, filterListElement); - var tree_view = options.allowTreeView && inventreeLoad('category-tree-view') == 1; - table.inventreeTable({ treeEnable: tree_view, rootParentId: tree_view ? options.params.parent : null, diff --git a/InvenTree/templates/js/translated/stock.js b/InvenTree/templates/js/translated/stock.js index 07689b7638..a62e049651 100644 --- a/InvenTree/templates/js/translated/stock.js +++ b/InvenTree/templates/js/translated/stock.js @@ -1426,6 +1426,12 @@ function loadStockLocationTable(table, options) { var filterListElement = options.filterList || '#filter-list-location'; + var tree_view = options.allowTreeView && inventreeLoad('location-tree-view') == 1; + + if (tree_view) { + params.cascade = true; + } + var filters = {}; var filterKey = options.filterKey || options.name || 'location'; @@ -1446,8 +1452,6 @@ function loadStockLocationTable(table, options) { filters[key] = params[key]; } - var tree_view = options.allowTreeView && inventreeLoad('location-tree-view') == 1; - table.inventreeTable({ treeEnable: tree_view, rootParentId: tree_view ? options.params.parent : null,