Browse Source

[9.0][IMP] base_tier_validation: tries automatically request validation and validate if possible.

pull/52/head
Lois Rilo 7 years ago
committed by Naglis Jonaitis
parent
commit
0fa10688ef
No known key found for this signature in database GPG Key ID: 4748835F585390F5
  1. 45
      base_tier_validation/models/tier_validation.py

45
base_tier_validation/models/tier_validation.py

@ -48,13 +48,19 @@ class TierValidation(models.AbstractModel):
@api.multi @api.multi
def _compute_validated_rejected(self): def _compute_validated_rejected(self):
"""Override for different validation/rejection policy."""
for rec in self: for rec in self:
# sort by tier
rec.validated = not any(
[s != 'approved' for s in self.review_ids.mapped('status')])
rec.rejected = any(
[s == 'rejected' for s in self.review_ids.mapped('status')])
rec.validated = self._calc_reviews_validated(rec.review_ids)
rec.rejected = self._calc_reviews_rejected(rec.review_ids)
@api.model
def _calc_reviews_validated(self, reviews):
"""Override for different validation policy."""
return not any([s != 'approved' for s in reviews.mapped('status')])
@api.model
def _calc_reviews_rejected(self, reviews):
"""Override for different rejection policy."""
return any([s == 'rejected' for s in reviews.mapped('status')])
@api.multi @api.multi
def _compute_need_validation(self): def _compute_need_validation(self):
@ -80,9 +86,13 @@ class TierValidation(models.AbstractModel):
if (getattr(rec, self._state_field) in self._state_from and if (getattr(rec, self._state_field) in self._state_from and
vals.get(self._state_field) in self._state_to): vals.get(self._state_field) in self._state_to):
if rec.need_validation: if rec.need_validation:
# try to validate operation
reviews = rec.request_validation()
rec._validate_tier(reviews)
if not self._calc_reviews_validated(reviews):
raise ValidationError(_( raise ValidationError(_(
"This action needs to be validated for at least one "
"record. \nPlease request a validation."))
"This action needs to be validated for at least "
"one record. \nPlease request a validation."))
if not rec.validated: if not rec.validated:
raise ValidationError(_( raise ValidationError(_(
"A validation process is still open for at least " "A validation process is still open for at least "
@ -95,15 +105,20 @@ class TierValidation(models.AbstractModel):
self.mapped('review_ids').sudo().unlink() self.mapped('review_ids').sudo().unlink()
return super(TierValidation, self).write(vals) return super(TierValidation, self).write(vals)
@api.multi
def validate_tier(self):
for rec in self:
user_reviews = rec.review_ids.filtered(
def _validate_tier(self, tiers=False):
self.ensure_one()
tier_reviews = tiers or self.review_ids
user_reviews = tier_reviews.filtered(
lambda r: r.status in ('pending', 'rejected') and lambda r: r.status in ('pending', 'rejected') and
(r.reviewer_id == self.env.user or (r.reviewer_id == self.env.user or
r.reviewer_group_id in self.env.user.groups_id)) r.reviewer_group_id in self.env.user.groups_id))
user_reviews.write({'status': 'approved'}) user_reviews.write({'status': 'approved'})
@api.multi
def validate_tier(self):
for rec in self:
rec._validate_tier()
@api.multi @api.multi
def reject_tier(self): def reject_tier(self):
for rec in self: for rec in self:
@ -116,7 +131,7 @@ class TierValidation(models.AbstractModel):
@api.multi @api.multi
def request_validation(self): def request_validation(self):
td_obj = self.env['tier.definition'] td_obj = self.env['tier.definition']
tr_obj = self.env['tier.review']
tr_obj = created_trs = self.env['tier.review']
for rec in self: for rec in self:
if getattr(rec, self._state_field) in self._state_from: if getattr(rec, self._state_field) in self._state_from:
if rec.need_validation: if rec.need_validation:
@ -126,11 +141,11 @@ class TierValidation(models.AbstractModel):
for td in tier_definitions: for td in tier_definitions:
if self.evaluate_tier(td): if self.evaluate_tier(td):
sequence += 1 sequence += 1
tr_obj.create({
created_trs += tr_obj.create({
'model': self._name, 'model': self._name,
'res_id': rec.id, 'res_id': rec.id,
'definition_id': td.id, 'definition_id': td.id,
'sequence': sequence, 'sequence': sequence,
}) })
# TODO: notify? post some msg in chatter? # TODO: notify? post some msg in chatter?
return True
return created_trs
Loading…
Cancel
Save