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

Bug fix for BOM table

Browse Source 
If the BOM for part included a BomItem with the same PK as the top-level part,
the bootstrap-tree-grid library borked

Probably for good reason, too!

So we now ensure that the top-level key is unique
This commit is contained in:
Oliver Walters 2020-11-24 21:19:19 +11:00
parent 28333c1a21
commit 083d7671d0
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
InvenTree/templates/js/bom.js
View File

@ -140,6 +140,12 @@ function loadBomTable(table, options) {
}); });
} }
// Set the parent ID of the multi-level table.
// We prepend this with the literal string value 'top-level-',
// because otherwise the unfortunate situation where BomItem.pk == BomItem.part.pk
// AND THIS BREAKS EVERYTHING
var parent_id = `top-level-${options.parent_id}`;
// Part column // Part column
cols.push( cols.push(
{ {
@ -197,11 +203,11 @@ function loadBomTable(table, options) {
text = parseFloat(text); text = parseFloat(text);
if (row.optional) { if (row.optional) {
text += " ({% trans "Optional" %})"; text += ' ({% trans "Optional" %})';
} }
if (row.overage) { if (row.overage) {
text += "<small> (+" + row.overage + ") </small>"; text += `<small> (${row.overage}) </small>`;
} }
return text; return text;
@ -233,7 +239,7 @@ function loadBomTable(table, options) {
// TODO - Re-introduce the pricing column at a later stage, // TODO - Re-introduce the pricing column at a later stage,
// once the pricing has been "fixed" // once the pricing has been "fixed"
// O.W. 2020-11-24 // O.W. 2020-11-24
cols.push( cols.push(
{ {
field: 'price_range', field: 'price_range',
@ -334,9 +340,8 @@ function loadBomTable(table, options) {
table.inventreeTable({ table.inventreeTable({
treeEnable: !options.editable, treeEnable: !options.editable,
rootParentId: options.parent_id, rootParentId: parent_id,
idField: 'pk', idField: 'pk',
//uniqueId: 'pk',
parentIdField: 'parentId', parentIdField: 'parentId',
treeShowField: 'sub_part', treeShowField: 'sub_part',
showColumns: true, showColumns: true,
@ -345,12 +350,18 @@ function loadBomTable(table, options) {
search: true, search: true,
rowStyle: function(row, index) { rowStyle: function(row, index) {
if (row.validated) { if (row.validated) {
return {classes: 'rowvalid'}; return {
classes: 'rowvalid'
};
} else { } else {
return {classes: 'rowinvalid'}; return {
classes: 'rowinvalid'
};
} }
}, },
formatNoMatches: function() { return '{% trans "No BOM items found" %}'; }, formatNoMatches: function() {
return '{% trans "No BOM items found" %}';
},
clickToSelect: true, clickToSelect: true,
queryParams: filters, queryParams: filters,
original: params, original: params,
@ -383,7 +394,7 @@ function loadBomTable(table, options) {
} }
// Set the parent ID of the top-level rows // Set the parent ID of the top-level rows
row.parentId = options.parent_id; row.parentId = parent_id;
table.bootstrapTable('updateRow', idx, row, true); table.bootstrapTable('updateRow', idx, row, true);