diff --git a/golem_member/models/golem_member_age_range.py b/golem_member/models/golem_member_age_range.py index 39ebcab..eb16441 100644 --- a/golem_member/models/golem_member_age_range.py +++ b/golem_member/models/golem_member_age_range.py @@ -32,30 +32,34 @@ class GolemMemberAgeRange(models.Model): _('This name has already been used. It must be unique.') )] - name = fields.Char(compute='_compute_name', store=True) - lower_bound = fields.Integer(required=True, index=True) - higher_bound = fields.Integer(required=True, index=True) + name = fields.Char(required=True) + lower_bound = fields.Integer(required=True) + higher_bound = fields.Integer(required=True) @api.constrains('lower_bound', 'higher_bound') def check_bounds(self): - """ Check member age bounds coherence and conflits """ + """ Check member age bounds coherence and conflicts """ for rng in self: if rng.lower_bound > rng.higher_bound: - verr = _(u'The higher bound age must be higher than ' - 'the lower bound.') + verr = _(u'The higher bound age must be higher than the lower ' + 'bound.') raise ValidationError(verr) rngs = self.env['golem.member.age.range'].search([]) for each_rng in rngs: if each_rng.lower_bound < rng.lower_bound < each_rng.higher_bound: - verr = _(u'Lower bound age in range of an ' - 'existing age range.') + verr = _(u'Lower bound age in range of an existing age ' + 'range.') raise ValidationError(verr) if each_rng.lower_bound < rng.higher_bound < each_rng.higher_bound: - verr = _(u'Higher bound age in range of an ' - 'existing age range.') + verr = _(u'Higher bound age in range of an existing age ' + 'range.') raise ValidationError(verr) - @api.depends('lower_bound', 'higher_bound') - def _compute_name(self): - """ Computes age range name """ + + @api.onchange('lower_bound', 'higher_bound') + def onchange_name(self): + """ If no name, computes age range name """ for rec in self: - rec.name = u'{}-{} years'.format(rec.lower_bound, rec.higher_bound) + if not rec.name and rec.lower_bound and rec.higher_bound: + rec.name = _(u'{}-{} years').format( + rec.lower_bound, rec.higher_bound + ) diff --git a/golem_member/views/golem_member_age_range_views.xml b/golem_member/views/golem_member_age_range_views.xml index 6642aa0..19d1aa5 100644 --- a/golem_member/views/golem_member_age_range_views.xml +++ b/golem_member/views/golem_member_age_range_views.xml @@ -39,7 +39,7 @@ along with this program. If not, see . diff --git a/golem_member/wizard/golem_member_analysis_wizard_views.xml b/golem_member/wizard/golem_member_analysis_wizard_views.xml index 0a909af..da0a10c 100644 --- a/golem_member/wizard/golem_member_analysis_wizard_views.xml +++ b/golem_member/wizard/golem_member_analysis_wizard_views.xml @@ -45,10 +45,10 @@ along with this program. If not, see . + target="current"/>