mirror of
https://github.com/inventree/InvenTree.git
synced 2025-12-16 01:08:12 +00:00
fix test
This commit is contained in:
@@ -213,17 +213,17 @@ class ImportPart(APIView):
|
|||||||
|
|
||||||
for c in category_parameters:
|
for c in category_parameters:
|
||||||
for p in parameters:
|
for p in parameters:
|
||||||
if p.parameter_template == c.parameter_template:
|
if p.parameter_template == c.template:
|
||||||
p.on_category = True
|
p.on_category = True
|
||||||
p.value = p.value if p.value is not None else c.default_value
|
p.value = p.value if p.value is not None else c.default_value
|
||||||
break
|
break
|
||||||
else:
|
else:
|
||||||
parameters.append(
|
parameters.append(
|
||||||
supplier.ImportParameter(
|
supplier.ImportParameter(
|
||||||
name=c.parameter_template.name,
|
name=c.template.name,
|
||||||
value=c.default_value,
|
value=c.default_value,
|
||||||
on_category=True,
|
on_category=True,
|
||||||
parameter_template=c.parameter_template,
|
parameter_template=c.template,
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
parameters.sort(key=lambda x: x.on_category, reverse=True)
|
parameters.sort(key=lambda x: x.on_category, reverse=True)
|
||||||
|
|||||||
@@ -2,14 +2,10 @@
|
|||||||
|
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
|
|
||||||
|
from common.models import ParameterTemplate
|
||||||
from company.models import ManufacturerPart, SupplierPart
|
from company.models import ManufacturerPart, SupplierPart
|
||||||
from InvenTree.unit_test import InvenTreeAPITestCase
|
from InvenTree.unit_test import InvenTreeAPITestCase
|
||||||
from part.models import (
|
from part.models import Part, PartCategory, PartCategoryParameterTemplate
|
||||||
Part,
|
|
||||||
PartCategory,
|
|
||||||
PartCategoryParameterTemplate,
|
|
||||||
PartParameterTemplate,
|
|
||||||
)
|
|
||||||
from plugin import registry
|
from plugin import registry
|
||||||
|
|
||||||
|
|
||||||
@@ -134,14 +130,14 @@ class SampleSupplierTest(InvenTreeAPITestCase):
|
|||||||
|
|
||||||
# valid supplier, valid part import
|
# valid supplier, valid part import
|
||||||
category = PartCategory.objects.get(pk=1)
|
category = PartCategory.objects.get(pk=1)
|
||||||
p_len = PartParameterTemplate(name='Length', units='mm')
|
p_len = ParameterTemplate(name='Length', units='mm')
|
||||||
p_test = PartParameterTemplate(name='Test Parameter')
|
p_test = ParameterTemplate(name='Test Parameter')
|
||||||
p_len.save()
|
p_len.save()
|
||||||
p_test.save()
|
p_test.save()
|
||||||
PartCategoryParameterTemplate.objects.bulk_create([
|
PartCategoryParameterTemplate.objects.bulk_create([
|
||||||
PartCategoryParameterTemplate(category=category, parameter_template=p_len),
|
PartCategoryParameterTemplate(category=category, template=p_len),
|
||||||
PartCategoryParameterTemplate(
|
PartCategoryParameterTemplate(
|
||||||
category=category, parameter_template=p_test, default_value='Test Value'
|
category=category, template=p_test, default_value='Test Value'
|
||||||
),
|
),
|
||||||
])
|
])
|
||||||
res = self.post(
|
res = self.post(
|
||||||
|
|||||||
Reference in New Issue
Block a user