From 0754afd5f54e4bf4140a11ed34744bf123d3eaf4 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Wed, 8 May 2019 20:16:53 +1000 Subject: [PATCH] Display icons in supplier_part list - Bug fix for part list API query --- InvenTree/company/templates/company/detail_part.html | 4 ++-- InvenTree/part/serializers.py | 4 ++-- InvenTree/static/script/inventree/part.js | 6 ++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/InvenTree/company/templates/company/detail_part.html b/InvenTree/company/templates/company/detail_part.html index 797446472f..24982c021f 100644 --- a/InvenTree/company/templates/company/detail_part.html +++ b/InvenTree/company/templates/company/detail_part.html @@ -51,10 +51,10 @@ }, { sortable: true, - field: 'part_name', + field: 'part_detail.name', title: 'Part', formatter: function(value, row, index, field) { - return renderLink(value, '/part/' + row.part + '/suppliers/'); + return imageHoverIcon(row.part_detail.image_url) + renderLink(value, '/part/' + row.part + '/suppliers/'); } }, { diff --git a/InvenTree/part/serializers.py b/InvenTree/part/serializers.py index 4621816343..7a12243a81 100644 --- a/InvenTree/part/serializers.py +++ b/InvenTree/part/serializers.py @@ -125,7 +125,7 @@ class SupplierPartSerializer(serializers.ModelSerializer): url = serializers.CharField(source='get_absolute_url', read_only=True) - part_name = serializers.CharField(source='part.name', read_only=True) + part_detail = PartBriefSerializer(source='part', many=False, read_only=True) supplier_name = serializers.CharField(source='supplier.name', read_only=True) @@ -135,7 +135,7 @@ class SupplierPartSerializer(serializers.ModelSerializer): 'pk', 'url', 'part', - 'part_name', + 'part_detail', 'supplier', 'supplier_name', 'SKU', diff --git a/InvenTree/static/script/inventree/part.js b/InvenTree/static/script/inventree/part.js index 41098ba71b..811f1987ab 100644 --- a/InvenTree/static/script/inventree/part.js +++ b/InvenTree/static/script/inventree/part.js @@ -86,7 +86,9 @@ function loadPartTable(table, url, options={}) { */ // Default query params - options.active = true; + query = options.query; + + query.active = true; $(table).bootstrapTable({ url: url, @@ -98,7 +100,7 @@ function loadPartTable(table, url, options={}) { pageSize: 25, rememberOrder: true, queryParams: function(p) { - return options; + return query; }, columns: [ {