From 2ace8f0270b26eae08c6fd6814605326de28da43 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Wed, 13 Jan 2016 13:48:03 +0100 Subject: [PATCH] [FIX] forum: duplicated method Identical method, written another way. Properly check the translated error. --- addons/website_forum/models/forum.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/addons/website_forum/models/forum.py b/addons/website_forum/models/forum.py index 629cf0e125f..eaf99a7811a 100644 --- a/addons/website_forum/models/forum.py +++ b/addons/website_forum/models/forum.py @@ -137,13 +137,7 @@ class Forum(models.Model): if (self.default_post_type == 'question' and not self.allow_question) \ or (self.default_post_type == 'discussion' and not self.allow_discussion) \ or (self.default_post_type == 'link' and not self.allow_link): - raise UserError(_('You cannot choose %s as default post since the forum does not allow it.' % self.default_post_type)) - - @api.one - @api.constrains('allow_link', 'allow_question', 'allow_discussion', 'default_post_type') - def _check_default_post_type(self): - if self.default_post_type == 'link' and not self.allow_link or self.default_post_type == 'question' and not self.allow_question or self.default_post_type == 'discussion' and not self.allow_discussion: - raise Warning(_('Post type in "Default post" must be activated')) + raise UserError(_('You cannot choose %s as default post since the forum does not allow it.') % self.default_post_type) @api.one def _compute_count_posts_waiting_validation(self):