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

remove short qr prefix validators and fix short qr detection regex

Browse Source
This commit is contained in:
wolflu05 2024-07-15 00:32:24 +02:00
parent c6b665bccf
commit 3999ae60db
No known key found for this signature in database
GPG Key ID: 9099EFC7C5EB963C
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/InvenTree/plugin/builtin/barcodes/inventree_barcode.py
View File

@ -11,7 +11,6 @@ import json
import re import re
from typing import cast from typing import cast
from django.core.validators import MaxLengthValidator, MinLengthValidator
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
import plugin.base.barcodes.helper import plugin.base.barcodes.helper
@ -45,7 +44,6 @@ class InvenTreeInternalBarcodePlugin(SettingsMixin, BarcodeMixin, InvenTreePlugi
'description': _( 'description': _(
'Customize the prefix used for short barcodes, may be useful for environments with multiple InvenTree instances' 'Customize the prefix used for short barcodes, may be useful for environments with multiple InvenTree instances'
), ),
'validator': [str, MinLengthValidator(4), MaxLengthValidator(4)],
'default': 'INV-', 'default': 'INV-',
}, },
} }
@ -63,7 +61,9 @@ class InvenTreeInternalBarcodePlugin(SettingsMixin, BarcodeMixin, InvenTreePlugi
# Attempt to match the barcode data against the short barcode format # Attempt to match the barcode data against the short barcode format
prefix = cast(str, self.get_setting('SHORT_BARCODE_PREFIX')) prefix = cast(str, self.get_setting('SHORT_BARCODE_PREFIX'))
if type(barcode_data) is str and ( if type(barcode_data) is str and (
m := re.match(f'^{re.escape(prefix)}(\\w{"{2}"})(\\d+)$', barcode_data) m := re.match(
f'^{re.escape(prefix)}([0-9A-Z $%*+-.\\/:]{"{2}"})(\\d+)$', barcode_data
)
): ):
model_type_code, pk = m.groups() model_type_code, pk = m.groups()