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

Fixes multiple issues for "used in" table

Browse Source
This commit is contained in:
Oliver 2021-11-15 23:51:02 +11:00
parent 01da889c46
commit c367fd7941
1 changed files with 38 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
InvenTree/templates/js/translated/bom.js
View File

@ -872,6 +872,42 @@ function loadUsedInTable(table, part_id, options={}) {
setupFilterList('usedin', $(table), options.filterTarget || '#filter-list-usedin'); setupFilterList('usedin', $(table), options.filterTarget || '#filter-list-usedin');
function loadVariantData(row) {
// Load variants information for inherited BOM rows
inventreeGet(
'{% url "api-part-list" %}',
{
assembly: true,
ancestor: row.part,
},
{
success: function(variantData) {
// Iterate through each variant item
for (var jj = 0; jj < variantData.length; jj++) {
variantData[jj].parent = row.pk;
var variant = variantData[jj];
// Add this variant to the table, augmented
$(table).bootstrapTable('append', [{
// Point the parent to the "master" assembly row
parent: row.pk,
part: variant.pk,
part_detail: variant,
sub_part: row.sub_part,
sub_part_detail: row.sub_part_detail,
quantity: row.quantity,
}]);
}
},
error: function(xhr) {
showApiError(xhr);
}
}
);
}
$(table).inventreeTable({ $(table).inventreeTable({
url: options.url || '{% url "api-bom-list" %}', url: options.url || '{% url "api-bom-list" %}',
name: options.table_name || 'usedin', name: options.table_name || 'usedin',
@ -898,38 +934,7 @@ function loadUsedInTable(table, part_id, options={}) {
continue; continue;
} }
var variants = inventreeGet( loadVariantData(row);
'{% url "api-part-list" %}',
{
assembly: true,
ancestor: row.part,
},
{
success: function(variantData) {
// Iterate through each variant item
for (var jj = 0; jj < variantData.length; jj++) {
variantData[jj].parent = row.pk;
var variant = variantData[jj];
// Add this variant to the table, augmented
$(table).bootstrapTable('append', [{
// Point the parent to the "master" assembly row
parent: row.pk,
part: variant.pk,
part_detail: variant,
sub_part: row.sub_part,
sub_part_detail: row.sub_part_detail,
quantity: row.quantity,
}]);
}
},
error: function(xhr) {
showApiError(xhr);
}
}
);
} }
}, },
onPostBody: function() { onPostBody: function() {
@ -985,7 +990,7 @@ function loadUsedInTable(table, part_id, options={}) {
formatter: function(value, row) { formatter: function(value, row) {
var html = value; var html = value;
if (row.parent != 'top-level-item') { if (row.parent && row.parent != 'top-level-item') {
html += ` <em>({% trans "Inherited from parent BOM" %})</em>`; html += ` <em>({% trans "Inherited from parent BOM" %})</em>`;
} }