From 5a6bea3452bb76ebdc131b8a9e6d774d1a94ccc7 Mon Sep 17 00:00:00 2001 From: rocheparadox Date: Thu, 14 Oct 2021 09:35:26 +0530 Subject: [PATCH] improve regex for part name format validation proper import of validation --- InvenTree/InvenTree/validators.py | 2 +- InvenTree/common/models.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/InvenTree/InvenTree/validators.py b/InvenTree/InvenTree/validators.py index 6ad49bc837..76d485cef9 100644 --- a/InvenTree/InvenTree/validators.py +++ b/InvenTree/InvenTree/validators.py @@ -166,7 +166,7 @@ def validate_part_name_format(self): """ jinja_template_regex = re.compile('{{.*?}}') - field_name_regex = re.compile('(?<=part\\.)[A-z]*') + field_name_regex = re.compile('(?<=part\\.)[A-z]+') for jinja_template in jinja_template_regex.findall(str(self)): # make sure at least one and only one field is present inside the parser field_names = field_name_regex.findall(jinja_template) diff --git a/InvenTree/common/models.py b/InvenTree/common/models.py index cadb64814d..d4f26af739 100644 --- a/InvenTree/common/models.py +++ b/InvenTree/common/models.py @@ -25,6 +25,7 @@ from django.core.exceptions import ValidationError import InvenTree.helpers import InvenTree.fields +import InvenTree.validators import logging @@ -707,7 +708,7 @@ class InvenTreeSetting(BaseInvenTreeSetting): 'description': _('Format to display the part name'), 'default': "{{ part.IPN if part.IPN }}{{ ' | ' if part.IPN }}{{ part.name }}{{ ' | ' if part.revision }}" "{{ part.revision if part.revision }}", - 'validator': InvenTree.fields.validate_part_name_format + 'validator': InvenTree.validators.validate_part_name_format }, 'REPORT_DEBUG_MODE': {