Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

handle case where stock item does not have a location set; also show header

Browse Source
This commit is contained in:
alex 2020-09-17 00:55:54 -07:00
parent 6ed604bbb8
commit d10ba5edc3
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
InvenTree/build/templates/build/allocate.html
View File

@ -50,6 +50,15 @@ InvenTree | Allocate Parts
return {{ build.quantity }} * row.quantity - sumAllocations(row); return {{ build.quantity }} * row.quantity - sumAllocations(row);
} }
function setExpandedAllocatedLocation(row) {
// Handle case when stock item does not have a location set
if (row.location_detail == null) {
return 'No stock location set';
} else {
return row.location_detail.pathstring;
}
}
function reloadTable() { function reloadTable() {
// Reload the build allocation table // Reload the build allocation table
buildTable.bootstrapTable('refresh'); buildTable.bootstrapTable('refresh');
@ -146,7 +155,7 @@ InvenTree | Allocate Parts
subTable.bootstrapTable({ subTable.bootstrapTable({
data: row.allocations, data: row.allocations,
showHeader: false, showHeader: true,
columns: [ columns: [
{ {
width: '50%', width: '50%',
@ -177,7 +186,7 @@ InvenTree | Allocate Parts
title: '{% trans "Location" %}', title: '{% trans "Location" %}',
formatter: function(value, row, index, field) { formatter: function(value, row, index, field) {
{% if build.status == BuildStatus.COMPLETE %} {% if build.status == BuildStatus.COMPLETE %}
var text = row.location_detail.pathstring; var text = setExpandedAllocatedLocation(row);
var url = `/stock/location/${row.location}/`; var url = `/stock/location/${row.location}/`;
{% else %} {% else %}
var text = row.stock_item_detail.location_name; var text = row.stock_item_detail.location_name;