From 4d35841233248e82d979d113abf8502a8c4cba43 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 23 May 2019 00:31:27 +1000 Subject: [PATCH] Consolidate on 'pk' as the ID field in the API --- InvenTree/company/api.py | 2 +- InvenTree/company/serializers.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/InvenTree/company/api.py b/InvenTree/company/api.py index 2ab51af4a0..7bb40f7269 100644 --- a/InvenTree/company/api.py +++ b/InvenTree/company/api.py @@ -152,7 +152,7 @@ supplier_part_api_urls = [ company_api_urls = [ - url(r'^part/', include(supplier_part_api_urls)), + url(r'^part/?', include(supplier_part_api_urls)), url(r'^price-break/?', SupplierPriceBreakList.as_view(), name='api-part-supplier-price'), diff --git a/InvenTree/company/serializers.py b/InvenTree/company/serializers.py index f09c170661..5d1ac2ba9d 100644 --- a/InvenTree/company/serializers.py +++ b/InvenTree/company/serializers.py @@ -33,7 +33,7 @@ class CompanySerializer(serializers.ModelSerializer): class Meta: model = Company fields = [ - 'id', + 'pk', 'url', 'name', 'description',