inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-05-02 13:28:49 +00:00
Code

Merge pull request #1058 from SchrodingersGat/stock-table-ordering

Browse Source 
Fix table sorting when groups are used.
This commit is contained in:
Oliver 2020-10-20 12:07:11 +11:00 committed by GitHub
commit 85ac1bfb95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
InvenTree/InvenTree/static/script/inventree/tables.js
View File

@ -181,8 +181,15 @@ function customGroupSorter(sortName, sortOrder, sortData) {
sortData.sort(function(a, b) {
// Extract default field values
var aa = a[sortName];
var bb = b[sortName];
// Allow multi-level access if required
// Ref: https://stackoverflow.com/a/6394168
function extract(obj, i) {
return obj[i];
}
var aa = sortName.split('.').reduce(extract, a);
var bb = sortName.split('.').reduce(extract, b);
// Extract parent information
var aparent = a._data && a._data['parent-index'];

13
InvenTree/templates/js/stock.html
View File

@ -274,16 +274,16 @@ function loadStockTable(table, options) {
var row = data[0];
if (field == 'part_name') {
if (field == 'part_detail.name') {
var name = row.part_detail.full_name;
return imageHoverIcon(row.part_detail.thumbnail) + name + ' <i>(' + data.length + ' items)</i>';
}
else if (field == 'IPN') {
else if (field == 'part_detail.IPN') {
return row.part_detail.IPN;
}
else if (field == 'part_description') {
else if (field == 'part_detail.description') {
return row.part_detail.description;
}
else if (field == 'quantity') {
@ -417,9 +417,10 @@ function loadStockTable(table, options) {
switchable: false,
},
{
field: 'part_name',
field: 'part_detail.name',
title: '{% trans "Part" %}',
sortable: true,
switchable: false,
formatter: function(value, row, index, field) {
var url = `/stock/item/${row.pk}/`;
@ -432,7 +433,7 @@ function loadStockTable(table, options) {
}
},
{
field: 'IPN',
field: 'part_detail.IPN',
title: 'IPN',
sortable: true,
formatter: function(value, row, index, field) {
@ -440,7 +441,7 @@ function loadStockTable(table, options) {
},
},
{
field: 'part_description',
field: 'part_detail.description',
title: '{% trans "Description" %}',
sortable: true,
formatter: function(value, row, index, field) {