From 6b73e7a408c4698d09232fb39ada8c493513f342 Mon Sep 17 00:00:00 2001 From: Oliver Date: Fri, 9 Jul 2021 14:28:32 +1000 Subject: [PATCH 1/3] Add more fields to ManufacturerPart and SupplierPart tables --- InvenTree/company/serializers.py | 19 +++++++++++-------- InvenTree/templates/js/company.js | 21 +++++++++++++++++++++ 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/InvenTree/company/serializers.py b/InvenTree/company/serializers.py index 276225624f..6e5ef08d6e 100644 --- a/InvenTree/company/serializers.py +++ b/InvenTree/company/serializers.py @@ -206,24 +206,27 @@ class SupplierPartSerializer(InvenTreeModelSerializer): MPN = serializers.StringRelatedField(source='manufacturer_part.MPN') - manufacturer_part = ManufacturerPartSerializer(read_only=True) + manufacturer_part_detail = ManufacturerPartSerializer(source='manufacturer_part', read_only=True) class Meta: model = SupplierPart fields = [ + 'description', + 'link', + 'manufacturer', + 'manufacturer_detail', + 'manufacturer_part', + 'manufacturer_part_detail', + 'MPN', + 'note', 'pk', + 'packaging', 'part', 'part_detail', 'pretty_name', + 'SKU', 'supplier', 'supplier_detail', - 'SKU', - 'manufacturer', - 'MPN', - 'manufacturer_detail', - 'manufacturer_part', - 'description', - 'link', ] def create(self, validated_data): diff --git a/InvenTree/templates/js/company.js b/InvenTree/templates/js/company.js index d28bca5547..18d7408b23 100644 --- a/InvenTree/templates/js/company.js +++ b/InvenTree/templates/js/company.js @@ -318,6 +318,12 @@ function loadManufacturerPartTable(table, url, options) { } } }, + { + field: 'description', + title: '{% trans "Description" %}', + sortable: false, + switchable: true, + } ], }); } @@ -550,6 +556,21 @@ function loadSupplierPartTable(table, url, options) { } } }, + { + field: 'description', + title: '{% trans "Description" %}', + sortable: false, + }, + { + field: 'note', + title: '{% trans "Notes" %}', + sortable: false, + }, + { + field: 'packaging', + title: '{% trans "Packaging" %}', + sortable: false, + } ], }); } \ No newline at end of file From c694c9467b5ed4d8755386d9f9c1f43161cc258b Mon Sep 17 00:00:00 2001 From: Oliver Date: Fri, 9 Jul 2021 14:39:08 +1000 Subject: [PATCH 2/3] sessionStorage -> localStorage OMG --- .../static/script/inventree/sidenav.js | 45 ++++++++++--------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/InvenTree/InvenTree/static/script/inventree/sidenav.js b/InvenTree/InvenTree/static/script/inventree/sidenav.js index ce1214abc4..6b5d190538 100644 --- a/InvenTree/InvenTree/static/script/inventree/sidenav.js +++ b/InvenTree/InvenTree/static/script/inventree/sidenav.js @@ -35,8 +35,8 @@ function loadTree(url, tree, options={}) { showTags: true, }); - if (sessionStorage.getItem(key)) { - var saved_exp = sessionStorage.getItem(key).split(","); + if (localStorage.getItem(key)) { + var saved_exp = localStorage.getItem(key).split(","); // Automatically expand the desired notes for (var q = 0; q < saved_exp.length; q++) { @@ -57,7 +57,7 @@ function loadTree(url, tree, options={}) { } // Save the expanded nodes - sessionStorage.setItem(key, exp); + localStorage.setItem(key, exp); }); } }, @@ -106,17 +106,17 @@ function initNavTree(options) { width: '0px' }, 50); - sessionStorage.setItem(stateLabel, 'closed'); + localStorage.setItem(stateLabel, 'closed'); } else { - sessionStorage.setItem(stateLabel, 'open'); - sessionStorage.setItem(widthLabel, `${width}px`); + localStorage.setItem(stateLabel, 'open'); + localStorage.setItem(widthLabel, `${width}px`); } } }); } - var state = sessionStorage.getItem(stateLabel); - var width = sessionStorage.getItem(widthLabel) || '300px'; + var state = localStorage.getItem(stateLabel); + var width = localStorage.getItem(widthLabel) || '300px'; if (state && state == 'open') { @@ -131,21 +131,21 @@ function initNavTree(options) { $(toggleId).click(function() { - var state = sessionStorage.getItem(stateLabel) || 'closed'; - var width = sessionStorage.getItem(widthLabel) || '300px'; + var state = localStorage.getItem(stateLabel) || 'closed'; + var width = localStorage.getItem(widthLabel) || '300px'; if (state == 'open') { $(treeId).animate({ width: '0px' }, 50); - sessionStorage.setItem(stateLabel, 'closed'); + localStorage.setItem(stateLabel, 'closed'); } else { $(treeId).animate({ width: width, }, 50); - sessionStorage.setItem(stateLabel, 'open'); + localStorage.setItem(stateLabel, 'open'); } }); } @@ -198,17 +198,20 @@ function enableNavbar(options) { width: '45px' }, 50); - sessionStorage.setItem(stateLabel, 'closed'); + localStorage.setItem(stateLabel, 'closed'); } else { - sessionStorage.setItem(widthLabel, `${width}px`); - sessionStorage.setItem(stateLabel, 'open'); + localStorage.setItem(widthLabel, `${width}px`); + localStorage.setItem(stateLabel, 'open'); } } }); } - var state = sessionStorage.getItem(stateLabel); - var width = sessionStorage.getItem(widthLabel) || '250px'; + var state = localStorage.getItem(stateLabel); + + console.log(stateLabel, '->', state); + + var width = localStorage.getItem(widthLabel) || '250px'; if (state && state == 'open') { @@ -224,8 +227,8 @@ function enableNavbar(options) { $(toggleId).click(function() { - var state = sessionStorage.getItem(stateLabel) || 'closed'; - var width = sessionStorage.getItem(widthLabel) || '250px'; + var state = localStorage.getItem(stateLabel) || 'closed'; + var width = localStorage.getItem(widthLabel) || '250px'; if (state == 'open') { $(navId).animate({ @@ -233,7 +236,7 @@ function enableNavbar(options) { minWidth: '45px', }, 50); - sessionStorage.setItem(stateLabel, 'closed'); + localStorage.setItem(stateLabel, 'closed'); } else { @@ -241,7 +244,7 @@ function enableNavbar(options) { 'width': width }, 50); - sessionStorage.setItem(stateLabel, 'open'); + localStorage.setItem(stateLabel, 'open'); } }); } From 47a56f7f5d2f8becb009d9df1a2548f5d2cda178 Mon Sep 17 00:00:00 2001 From: Oliver Date: Fri, 9 Jul 2021 14:54:03 +1000 Subject: [PATCH 3/3] Fixes for unit tests --- InvenTree/company/test_api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/InvenTree/company/test_api.py b/InvenTree/company/test_api.py index 40176c7634..2da6d29198 100644 --- a/InvenTree/company/test_api.py +++ b/InvenTree/company/test_api.py @@ -230,7 +230,7 @@ class ManufacturerTest(InvenTreeAPITestCase): self.assertEqual(response.status_code, status.HTTP_201_CREATED) # Check manufacturer part - manufacturer_part_id = int(response.data['manufacturer_part']['pk']) + manufacturer_part_id = int(response.data['manufacturer_part_detail']['pk']) url = reverse('api-manufacturer-part-detail', kwargs={'pk': manufacturer_part_id}) response = self.get(url) self.assertEqual(response.data['MPN'], 'PART_NUMBER')