inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-12-16 09:18:10 +00:00
Code Activity

More fixes

Browse Source
This commit is contained in:
Oliver Walters
2025-11-26 05:54:46 +00:00
parent 7620a681e2
commit a4d16f3621
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/InvenTree/part/models.py
View File

@@ -226,7 +226,7 @@ class PartCategory(
"""Prefectch parts parameters.""" """Prefectch parts parameters."""
return ( return (
self.get_parts(cascade=cascade) self.get_parts(cascade=cascade)
.prefetch_related('parameters', 'parameters__template') .prefetch_related('parameters_list', 'parameters_list__template')
.all() .all()
) )
@@ -237,7 +237,7 @@ class PartCategory(
parts = prefetch or self.prefetch_parts_parameters(cascade=cascade) parts = prefetch or self.prefetch_parts_parameters(cascade=cascade)
for part in parts: for part in parts:
for parameter in part.parameters.all(): for parameter in part.parameters_list.all():
parameter_name = parameter.template.name parameter_name = parameter.template.name
if parameter_name not in unique_parameters_names: if parameter_name not in unique_parameters_names:
unique_parameters_names.append(parameter_name) unique_parameters_names.append(parameter_name)
@@ -260,7 +260,7 @@ class PartCategory(
if part.IPN: if part.IPN:
part_parameters['IPN'] = part.IPN part_parameters['IPN'] = part.IPN
for parameter in part.parameters.all(): for parameter in part.parameters_list.all():
parameter_name = parameter.template.name parameter_name = parameter.template.name
parameter_value = parameter.data parameter_value = parameter.data
part_parameters[parameter_name] = parameter_value part_parameters[parameter_name] = parameter_value
@@ -3763,7 +3763,7 @@ class PartCategoryParameterTemplate(InvenTree.models.InvenTreeMetadataModel):
if ( if (
self.default_value self.default_value
and get_global_setting( and get_global_setting(
'PART_PARAMETER_ENFORCE_UNITS', True, cache=False, create=False 'PARAMETER_ENFORCE_UNITS', True, cache=False, create=False
) )
and self.template.units and self.template.units
): ):

2
src/backend/InvenTree/part/test_category.py
View File

@@ -163,7 +163,7 @@ class CategoryTest(TestCase):
# Iterate through all parts and parameters # Iterate through all parts and parameters
for fastener in fasteners: for fastener in fasteners:
self.assertIsInstance(fastener, Part) self.assertIsInstance(fastener, Part)
for parameter in fastener.parameters.all(): for parameter in fastener.parameters_list.all():
self.assertIsInstance(parameter, Parameter) self.assertIsInstance(parameter, Parameter)
self.assertIsInstance(parameter.template, ParameterTemplate) self.assertIsInstance(parameter.template, ParameterTemplate)

2
src/backend/InvenTree/part/test_param.py
View File

@@ -249,8 +249,6 @@ class ParameterTests(TestCase):
bad_values = ['3 Amps', '-3 zogs', '3.14F'] bad_values = ['3 Amps', '-3 zogs', '3.14F']
raise ValueError('This test must be refactored...')
# Disable enforcing of part parameter units # Disable enforcing of part parameter units
InvenTreeSetting.set_setting('PARAMETER_ENFORCE_UNITS', False, change_user=None) InvenTreeSetting.set_setting('PARAMETER_ENFORCE_UNITS', False, change_user=None)