inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-30 12:36:45 +00:00
Code

Bug fix for stock location table

Browse Source 
(cherry picked from commit 44794d7b78520023e3b70da61dc13938bfd4bd14)
This commit is contained in:
Oliver 2021-11-03 13:27:58 +11:00
parent 08719d4d1b
commit c4ea3ecf6f
2 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
InvenTree/stock/templates/stock/location.html
View File

@ -183,7 +183,8 @@
{% else %} {% else %}
parent: 'null', parent: 'null',
{% endif %} {% endif %}
} },
allowTreeView: true,
}); });
linkButtonsToSelection( linkButtonsToSelection(

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

@ -1416,8 +1416,11 @@ function loadStockTable(table, options) {
}); });
} }
/*
* Display a table of stock locations
*/
function loadStockLocationTable(table, options) { function loadStockLocationTable(table, options) {
/* Display a table of stock locations */
var params = options.params || {}; var params = options.params || {};
@ -1443,15 +1446,15 @@ function loadStockLocationTable(table, options) {
filters[key] = params[key]; filters[key] = params[key];
} }
var tree_view = inventreeLoad('location-tree-view') == 1; var tree_view = options.allowTreeView && inventreeLoad('location-tree-view') == 1;
table.inventreeTable({ table.inventreeTable({
treeEnable: tree_view, treeEnable: options.allowTreeView && tree_view,
rootParentId: options.params.parent, rootParentId: options.params.parent,
uniqueId: 'pk', uniqueId: 'pk',
idField: 'pk', idField: 'pk',
treeShowField: 'name', treeShowField: 'name',
parentIdField: 'parent', parentIdField: tree_view ? 'parent' : null,
disablePagination: tree_view, disablePagination: tree_view,
sidePagination: tree_view ? 'client' : 'server', sidePagination: tree_view ? 'client' : 'server',
serverSort: !tree_view, serverSort: !tree_view,
@ -1465,28 +1468,31 @@ function loadStockLocationTable(table, options) {
showColumns: true, showColumns: true,
onPostBody: function() { onPostBody: function() {
tree_view = inventreeLoad('location-tree-view') == 1; if (options.allowTreeView) {
if (tree_view) { tree_view = inventreeLoad('location-tree-view') == 1;
$('#view-location-list').removeClass('btn-secondary').addClass('btn-outline-secondary'); if (tree_view) {
$('#view-location-tree').removeClass('btn-outline-secondary').addClass('btn-secondary');
$('#view-location-list').removeClass('btn-secondary').addClass('btn-outline-secondary');
table.treegrid({ $('#view-location-tree').removeClass('btn-outline-secondary').addClass('btn-secondary');
treeColumn: 1,
onChange: function() { table.treegrid({
table.bootstrapTable('resetView'); treeColumn: 1,
}, onChange: function() {
onExpand: function() { table.bootstrapTable('resetView');
},
} onExpand: function() {
});
} else { }
$('#view-location-tree').removeClass('btn-secondary').addClass('btn-outline-secondary'); });
$('#view-location-list').removeClass('btn-outline-secondary').addClass('btn-secondary'); } else {
$('#view-location-tree').removeClass('btn-secondary').addClass('btn-outline-secondary');
$('#view-location-list').removeClass('btn-outline-secondary').addClass('btn-secondary');
}
} }
}, },
buttons: [ buttons: options.allowTreeView ? [
{ {
icon: 'fas fa-bars', icon: 'fas fa-bars',
attributes: { attributes: {
@ -1525,7 +1531,7 @@ function loadStockLocationTable(table, options) {
); );
} }
} }
], ] : [],
columns: [ columns: [
{ {
checkbox: true, checkbox: true,