inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-05-02 05:26:45 +00:00
Code

Merge pull request #2247 from SchrodingersGat/tree-view-fixes

Browse Source 
Fix for tree-view
This commit is contained in:
Oliver 2021-11-04 15:30:07 +11:00 committed by GitHub
commit 3b052e6bce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
InvenTree/templates/js/translated/part.js
View File

@ -1159,6 +1159,13 @@ function loadPartCategoryTable(table, options) {
filters = loadTableFilters(filterKey); filters = loadTableFilters(filterKey);
} }
var tree_view = options.allowTreeView && inventreeLoad('category-tree-view') == 1;
if (tree_view) {
params.cascade = true;
}
var original = {}; var original = {};
for (var key in params) { for (var key in params) {
@ -1168,8 +1175,6 @@ function loadPartCategoryTable(table, options) {
setupFilterList(filterKey, table, filterListElement); setupFilterList(filterKey, table, filterListElement);
var tree_view = options.allowTreeView && inventreeLoad('category-tree-view') == 1;
table.inventreeTable({ table.inventreeTable({
treeEnable: tree_view, treeEnable: tree_view,
rootParentId: tree_view ? options.params.parent : null, rootParentId: tree_view ? options.params.parent : null,

8
InvenTree/templates/js/translated/stock.js
View File

@ -1426,6 +1426,12 @@ function loadStockLocationTable(table, options) {
var filterListElement = options.filterList || '#filter-list-location'; 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 filters = {};
var filterKey = options.filterKey || options.name || 'location'; var filterKey = options.filterKey || options.name || 'location';
@ -1446,8 +1452,6 @@ function loadStockLocationTable(table, options) {
filters[key] = params[key]; filters[key] = params[key];
} }
var tree_view = options.allowTreeView && inventreeLoad('location-tree-view') == 1;
table.inventreeTable({ table.inventreeTable({
treeEnable: tree_view, treeEnable: tree_view,
rootParentId: tree_view ? options.params.parent : null, rootParentId: tree_view ? options.params.parent : null,