pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] barcodes: more specific ValidationError messages in pattern constraint

Browse Source
This commit is contained in:
Aaron Bohy
2014-11-26 12:11:54 +01:00
committed by Frédéric van der Essen
parent 0d9a1226b0
commit 658f310223
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/barcodes/barcodes.py
+6 -4
View File
@@ -183,8 +183,10 @@ class barcode_rule(models.Model):
def _check_pattern(self):
p = self.pattern.replace("\\\\", "X").replace("\{", "X").replace("\}", "X")
findall = re.findall("[{]|[}]", p) # p does not contain escaped { or }
if len(findall) == 2:
if not re.search("[{][N]*[D]*[}]", p) or re.search("[{][}]", p):
raise ValidationError(_("There is a syntax error in the barcode pattern") + " %s." % self.pattern)
if len(findall) == 2:
if not re.search("[{][N]*[D]*[}]", p):
raise ValidationError(_("There is a syntax error in the barcode pattern ") + self.pattern + _(": braces can only contain N's followed by D's."))
elif re.search("[{][}]", p):
raise ValidationError(_("There is a syntax error in the barcode pattern ") + self.pattern + _(": empty braces."))
elif len(findall) != 0:
raise ValidationError(_("There is a syntax error in the barcode pattern") + " %s." % self.pattern)
raise ValidationError(_("There is a syntax error in the barcode pattern ") + self.pattern + _(": a rule can only contain one pair of braces."))