odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] raise warning instead of return false 

bzr revid: mat@openerp.com-20130314110649-6hk4g03bkqtpq0on
This commit is contained in:
Martin Trigaux 2013-03-14 12:06:49 +01:00
parent df917d317f
commit 1f5e76f314
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
addons/gamification/badge.py
View File

@ -21,6 +21,7 @@
from openerp.osv import fields, osv
from openerp import tools
from openerp.tools.translate import _
from templates import TemplateHelper
from datetime import date
@ -200,7 +201,6 @@ result = pool.get('res.users').search(cr, uid, domain=[], context=context)""",
values['user_from'] = False
body_html = template_env.get_template('badge_received.mako').render(values)
context['badge_user'] = badge_user
res = self.message_post(cr, uid, 0,
body=body_html,
partner_ids=[(4, badge_user.user_id.partner_id.id)],
@ -311,11 +311,11 @@ result = pool.get('res.users').search(cr, uid, domain=[], context=context)""",
badge = self.browse(cr, uid, badge_id, context=context)
if badge.rule_auth == 'nobody':
return False
raise osv.except_osv(_('Warning!'), _('This badge can not be sent by users.'))
elif badge.rule_auth == 'list':
if user_from_id not in [user.id for user in badge.rule_auth_user_ids]:
return False
raise osv.except_osv(_('Warning!'), _('You are not in the user allowed list.'))
elif badge.rule_auth == 'having':
badge_users = self.pool.get('gamification.badge.user').search(
@ -323,7 +323,7 @@ result = pool.get('res.users').search(cr, uid, domain=[], context=context)""",
if len(badge_users) == 0:
# the user_from has no badges
return False
raise osv.except_osv(_('Warning!'), _('You do not have the required badges.'))
owners = [owner.id for owner in badge.owner_ids]
granted = False
@ -331,13 +331,13 @@ result = pool.get('res.users').search(cr, uid, domain=[], context=context)""",
if badge_user.id in owners:
granted = True
if not granted:
return False
raise osv.except_osv(_('Warning!'), _('You do not have the required badges.'))
# else badge.rule_auth == 'everyone' -> no check
if badge.rule_max and badge.stat_this_month >= badge.rule_max_number:
# sent the maximum number of time this month
return False
raise osv.except_osv(_('Warning!'), _('This badge has been already sent too many time this month.'))
return True

2
addons/gamification/plan.py
View File

@ -313,7 +313,7 @@ class gamification_goal_plan(osv.Model):
""" This opens goal view with a restriction to the list of goals from this plan only
@return: the goal view
"""
# get ids of related goals
# get ids of related goals
goal_obj = self.pool.get('gamification.goal')
related_goal_ids = []
goal_ids = goal_obj.search(cr, uid, [('plan_id', 'in', ids)], context=context)