mirror of
https://github.com/inventree/InvenTree.git
synced 2025-04-30 04:26:44 +00:00
Merge pull request #575 from SchrodingersGat/stock-table-notes-fix
Properly display 'notes' field in grouped rows for stock table
This commit is contained in:
commit
b92b7dc825
@ -125,6 +125,28 @@ function loadStockTable(table, options) {
|
|||||||
// A single location!
|
// A single location!
|
||||||
return renderLink(row.location__path, '/stock/location/' + row.location + '/')
|
return renderLink(row.location__path, '/stock/location/' + row.location + '/')
|
||||||
}
|
}
|
||||||
|
} else if (field == 'notes') {
|
||||||
|
var notes = [];
|
||||||
|
|
||||||
|
data.forEach(function(item) {
|
||||||
|
var note = item.notes;
|
||||||
|
|
||||||
|
if (!note || note == '') {
|
||||||
|
note = '-';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!notes.includes(note)) {
|
||||||
|
notes.push(note);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
if (notes.length > 1) {
|
||||||
|
return '...';
|
||||||
|
} else if (notes.length == 1) {
|
||||||
|
return notes[0] || '-';
|
||||||
|
} else {
|
||||||
|
return '-';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
return '';
|
return '';
|
||||||
|
Loading…
x
Reference in New Issue
Block a user