From 13bfaef3a3625deb4ba1d05c50647b6126175c6f Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Tue, 24 Dec 2013 16:15:43 +0100 Subject: [PATCH] [FIX] gamification: remove old calls to action_start bzr revid: mat@openerp.com-20131224151543-oofn9wc2w3933gjy --- addons/gamification/models/challenge.py | 6 +++--- addons/gamification/tests/test_challenge.py | 2 +- addons/hr_gamification/models/gamification.py | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py index 5bbee5bbede..ae27aa96719 100644 --- a/addons/gamification/models/challenge.py +++ b/addons/gamification/models/challenge.py @@ -241,7 +241,7 @@ class gamification_challenge(osv.Model): vals['user_ids'] += [(4, user.id) for user in new_group.users] if vals.get('state') == 'inprogress': - + # starting a challenge if not vals.get('autojoin_group_id'): # starting challenge, add users in autojoin group if not vals.get('user_ids'): @@ -284,13 +284,13 @@ class gamification_challenge(osv.Model): planned_challenge_ids = self.search(cr, uid, [ ('state', '=', 'draft'), ('start_date', '<=', fields.date.today())]) - self.action_start(cr, uid, planned_challenge_ids, context=context) + self.write(cr, uid, planned_challenge_ids, {'state': 'inprogress'}, context=context) # close planned challenges planned_challenge_ids = self.search(cr, uid, [ ('state', '=', 'inprogress'), ('end_date', '>=', fields.date.today())]) - self.action_close(cr, uid, planned_challenge_ids, context=context) + self.write(cr, uid, planned_challenge_ids, {'state': 'done'}, context=context) if not ids: ids = self.search(cr, uid, [('state', '=', 'inprogress')], context=context) diff --git a/addons/gamification/tests/test_challenge.py b/addons/gamification/tests/test_challenge.py index c5dc02ef468..2655a1b26fd 100644 --- a/addons/gamification/tests/test_challenge.py +++ b/addons/gamification/tests/test_challenge.py @@ -63,7 +63,7 @@ class test_challenge(common.TransactionCase): def test_10_reach_challenge(self): cr, uid, context = self.cr, self.uid, {} - self.challenge_obj.action_start(cr, uid, [self.challenge_base_id], context=context) + self.challenge_obj.write(cr, uid, [self.challenge_base_id], {'state': 'inprogress'}, context=context) challenge = self.challenge_obj.browse(cr, uid, self.challenge_base_id, context=context) challenge_user_ids = [user.id for user in challenge.user_ids] diff --git a/addons/hr_gamification/models/gamification.py b/addons/hr_gamification/models/gamification.py index f07ed9c95c4..b2aa9039cb1 100644 --- a/addons/hr_gamification/models/gamification.py +++ b/addons/hr_gamification/models/gamification.py @@ -20,7 +20,6 @@ ############################################################################## from openerp.osv import fields, osv -from openerp import SUPERUSER_ID class hr_gamification_badge_user(osv.Model):