Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Param fix (#5183) (#5184)

Browse Source 
* Handle AttributeError in convert_physical_value

* Added new unit test

(cherry picked from commit 9abcc0ec34)

Co-authored-by: Oliver <oliver.henry.walters@gmail.com>
This commit is contained in:
github-actions[bot] 2023-07-06 11:11:27 +10:00 committed by GitHub
parent 4a5ebf8f01
commit c59eee7359
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
InvenTree/InvenTree/conversion.py
View File

@ -91,7 +91,7 @@ def convert_physical_value(value: str, unit: str = None):
# At this point we *should* have a valid pint value # At this point we *should* have a valid pint value
# To double check, look at the maginitude # To double check, look at the maginitude
float(val.magnitude) float(val.magnitude)
except (TypeError, ValueError): except (TypeError, ValueError, AttributeError):
error = _('Provided value is not a valid number') error = _('Provided value is not a valid number')
except (pint.errors.UndefinedUnitError, pint.errors.DefinitionSyntaxError): except (pint.errors.UndefinedUnitError, pint.errors.DefinitionSyntaxError):
error = _('Provided value has an invalid unit') error = _('Provided value has an invalid unit')

17
InvenTree/InvenTree/tests.py
View File

@ -56,6 +56,23 @@ class ConversionTest(TestCase):
q = InvenTree.conversion.convert_physical_value(val).to_base_units() q = InvenTree.conversion.convert_physical_value(val).to_base_units()
self.assertEqual(q.magnitude, expected) self.assertEqual(q.magnitude, expected)
def test_invalid_values(self):
"""Test conversion of invalid inputs"""
inputs = [
'-',
';;',
'-x',
'?',
'--',
'+',
'++',
]
for val in inputs:
with self.assertRaises(ValidationError):
InvenTree.conversion.convert_physical_value(val)
class ValidatorTest(TestCase): class ValidatorTest(TestCase):
"""Simple tests for custom field validators.""" """Simple tests for custom field validators."""

1
InvenTree/templates/js/translated/part.js
View File

@ -1404,6 +1404,7 @@ function createPartParameter(part_id, options={}) {
function editPartParameter(param_id, options={}) { function editPartParameter(param_id, options={}) {
options.fields = partParameterFields(); options.fields = partParameterFields();
options.title = '{% trans "Edit Parameter" %}'; options.title = '{% trans "Edit Parameter" %}';
options.focus = 'data';
options.processBeforeUpload = function(data) { options.processBeforeUpload = function(data) {
// Convert data to string // Convert data to string