mirror of
https://github.com/inventree/InvenTree.git
synced 2025-04-30 04:26:44 +00:00
Merge pull request #1536 from eeintech/manufacturer_part_api_fix
API fixes related to ManufacturerPart
This commit is contained in:
commit
94ff8829f7
@ -131,7 +131,7 @@ class ManufacturerPartList(generics.ListCreateAPIView):
|
|||||||
params = self.request.query_params
|
params = self.request.query_params
|
||||||
|
|
||||||
# Filter by manufacturer
|
# Filter by manufacturer
|
||||||
manufacturer = params.get('company', None)
|
manufacturer = params.get('manufacturer', None)
|
||||||
|
|
||||||
if manufacturer is not None:
|
if manufacturer is not None:
|
||||||
queryset = queryset.filter(manufacturer=manufacturer)
|
queryset = queryset.filter(manufacturer=manufacturer)
|
||||||
|
@ -192,10 +192,11 @@ class SupplierPartSerializer(InvenTreeModelSerializer):
|
|||||||
manufacturer_id = self.initial_data.get('manufacturer', None)
|
manufacturer_id = self.initial_data.get('manufacturer', None)
|
||||||
MPN = self.initial_data.get('MPN', None)
|
MPN = self.initial_data.get('MPN', None)
|
||||||
|
|
||||||
if manufacturer_id or MPN:
|
if manufacturer_id and MPN:
|
||||||
kwargs = {'manufacturer': manufacturer_id,
|
kwargs = {
|
||||||
'MPN': MPN,
|
'manufacturer': manufacturer_id,
|
||||||
}
|
'MPN': MPN,
|
||||||
|
}
|
||||||
supplier_part.save(**kwargs)
|
supplier_part.save(**kwargs)
|
||||||
|
|
||||||
return supplier_part
|
return supplier_part
|
||||||
|
@ -100,7 +100,7 @@ class ManufacturerTest(InvenTreeAPITestCase):
|
|||||||
self.assertEqual(response.data['MPN'], 'MPN_TEST')
|
self.assertEqual(response.data['MPN'], 'MPN_TEST')
|
||||||
|
|
||||||
# Filter by manufacturer
|
# Filter by manufacturer
|
||||||
data = {'company': 7}
|
data = {'manufacturer': 7}
|
||||||
response = self.get(url, data)
|
response = self.get(url, data)
|
||||||
self.assertEqual(len(response.data), 3)
|
self.assertEqual(len(response.data), 3)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user