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

[FIX] gamification: move manifest order and remove useless browse 

bzr revid: mat@openerp.com-20131218121459-zlfumwysdx9qm7d9
This commit is contained in:
Martin Trigaux 2013-12-18 13:14:59 +01:00
parent 5acd144c81
commit 553e85f369
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/models/badge.py
View File

@ -78,12 +78,12 @@ class gamification_badge(osv.Model):
result = dict.fromkeys(ids, False)
badge_user_obj = self.pool.get('gamification.badge.user')
first_month_day = date.today().replace(day=1).strftime(DF)
for obj in self.browse(cr, uid, ids, context=context):
result[obj.id] = {
'stat_my': badge_user_obj.search(cr, uid, [('badge_id', '=', obj.id), ('user_id', '=', uid)], context=context, count=True),
'stat_this_month': badge_user_obj.search(cr, uid, [('badge_id', '=', obj.id), ('create_date', '>=', first_month_day)], context=context, count=True),
'stat_my_this_month': badge_user_obj.search(cr, uid, [('badge_id', '=', obj.id), ('user_id', '=', uid), ('create_date', '>=', first_month_day)], context=context, count=True),
'stat_my_monthly_sending': badge_user_obj.search(cr, uid, [('badge_id', '=', obj.id), ('create_uid', '=', uid), ('create_date', '>=', first_month_day)], context=context, count=True)
for bid in ids:
result[id] = {
'stat_my': badge_user_obj.search(cr, uid, [('badge_id', '=', bid), ('user_id', '=', uid)], context=context, count=True),
'stat_this_month': badge_user_obj.search(cr, uid, [('badge_id', '=', bid), ('create_date', '>=', first_month_day)], context=context, count=True),
'stat_my_this_month': badge_user_obj.search(cr, uid, [('badge_id', '=', bid), ('user_id', '=', uid), ('create_date', '>=', first_month_day)], context=context, count=True),
'stat_my_monthly_sending': badge_user_obj.search(cr, uid, [('badge_id', '=', bid), ('create_uid', '=', uid), ('create_date', '>=', first_month_day)], context=context, count=True)
}
return result

2
addons/hr_gamification/__openerp__.py
View File

@ -33,8 +33,8 @@ Badge received are displayed on the user profile.
'data': [
'security/ir.model.access.csv',
'security/gamification_security.xml',
'views/gamification.xml',
'wizard/grant_badge.xml',
'views/gamification.xml',
],
'js': ['static/src/js/gamification.js'],
}