From 83805f3b42350dc7c5979c1cb7d3d0f60a629afd Mon Sep 17 00:00:00 2001 From: eLBati Date: Mon, 19 Oct 2015 16:16:09 +0200 Subject: [PATCH] Improve validator_line check --- base_field_validator/models/ir_model.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/base_field_validator/models/ir_model.py b/base_field_validator/models/ir_model.py index a8bfa6cfc..fd5bd8684 100644 --- a/base_field_validator/models/ir_model.py +++ b/base_field_validator/models/ir_model.py @@ -23,17 +23,17 @@ class IrModel(models.Model): @api.model def check_vals(self, vals, model_name): - models = self.search([('model', '=', model_name)], limit=1) - model = models[0] - for validator_line in model.validator_line_ids: - if validator_line.field_id.name in vals: - pattern = re.compile(validator_line.regex_id.regex) - if vals[validator_line.field_id.name]: - if not pattern.match(vals[validator_line.field_id.name]): - raise Warning( - _('Expression %s not valid for %s') % ( - validator_line.regex_id.regex, - vals[validator_line.field_id.name])) + validator_lines = self.env['ir.model.validator.line'].search([ + ('name.model', '=', model_name), + ('field_id.name', 'in', vals.keys())]) + for validator_line in validator_lines: + pattern = re.compile(validator_line.regex_id.regex) + if vals[validator_line.field_id.name]: + if not pattern.match(vals[validator_line.field_id.name]): + raise Warning( + _('Expression %s not valid for %s') % ( + validator_line.regex_id.regex, + vals[validator_line.field_id.name])) return True