inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-07-01 19:20:55 +00:00
Code Activity

Merge remote-tracking branch 'inventree/master' into stock-item-forms

Browse Source
This commit is contained in:
Oliver
2021-11-04 17:24:30 +11:00
parent be543ca3da 2130b02e7f
commit f0e44f0efd
10 changed files with 323 additions and 170 deletions
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);
}
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,

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

@ -1679,6 +1679,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';
@ -1699,8 +1705,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,