diff --git a/addons/gamification/data/goal_base.xml b/addons/gamification/data/goal_base.xml index b517bb50713..af96a4806cf 100644 --- a/addons/gamification/data/goal_base.xml +++ b/addons/gamification/data/goal_base.xml @@ -297,7 +297,7 @@ Thank you, never inprogress - other + other @@ -307,7 +307,7 @@ Thank you, never inprogress - other + other diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py index 72103f89205..ad932dddc31 100644 --- a/addons/gamification/models/challenge.py +++ b/addons/gamification/models/challenge.py @@ -123,7 +123,7 @@ class Challenge(models.Model): last_report_date = fields.Date("Last Report Date", default=fields.Date.today) next_report_date = fields.Date("Next Report Date", compute='_get_next_report_date', store=True) - category = fields.Selection([ + challenge_category = fields.Selection([ ('hr', 'Human Resources / Engagement'), ('other', 'Settings / Gamification Tools'), ], string="Appears in", required=True, default='hr', diff --git a/addons/gamification/views/challenge.xml b/addons/gamification/views/challenge.xml index bbc11afe910..6b8ccc9c25b 100644 --- a/addons/gamification/views/challenge.xml +++ b/addons/gamification/views/challenge.xml @@ -123,7 +123,7 @@ - + @@ -218,7 +218,7 @@ + domain="[('challenge_category', '=', 'hr')]"/> diff --git a/addons/hr_gamification/models/hr_employee.py b/addons/hr_gamification/models/hr_employee.py index d36edd79d49..441c104c635 100644 --- a/addons/hr_gamification/models/hr_employee.py +++ b/addons/hr_gamification/models/hr_employee.py @@ -18,12 +18,12 @@ class HrEmployeeBase(models.AbstractModel): 'gamification.badge.user', 'employee_id', help="Badges directly linked to the employee") - @api.depends('user_id.goal_ids.challenge_id.category') + @api.depends('user_id.goal_ids.challenge_id.challenge_category') def _compute_employee_goals(self): for employee in self: employee.goal_ids = self.env['gamification.goal'].search([ ('user_id', '=', employee.user_id.id), - ('challenge_id.category', '=', 'hr'), + ('challenge_id.challenge_category', '=', 'hr'), ]) @api.depends('direct_badge_ids', 'user_id.badge_ids.employee_id') diff --git a/addons/hr_gamification/views/gamification_views.xml b/addons/hr_gamification/views/gamification_views.xml index 3ce94e91a14..c2b378fa42d 100644 --- a/addons/hr_gamification/views/gamification_views.xml +++ b/addons/hr_gamification/views/gamification_views.xml @@ -19,7 +19,7 @@ Goals History tree,kanban {'search_default_group_by_user': True, 'search_default_group_by_definition': True} - [('challenge_id.category', '=', 'hr')] + [('challenge_id.challenge_category', '=', 'hr')]

Create a new goal @@ -35,7 +35,7 @@ Challenges gamification.challenge kanban,tree,form - [('category', '=', 'hr')] + [('challenge_category', '=', 'hr')] {'search_default_inprogress':True, 'default_inprogress':True}

diff --git a/addons/survey/models/challenge.py b/addons/survey/models/challenge.py index e1677d46fc9..b4cd4626b91 100644 --- a/addons/survey/models/challenge.py +++ b/addons/survey/models/challenge.py @@ -7,4 +7,4 @@ from odoo import models, fields class Challenge(models.Model): _inherit = 'gamification.challenge' - category = fields.Selection(selection_add=[('certification', 'Certifications')]) + challenge_category = fields.Selection(selection_add=[('certification', 'Certifications')]) diff --git a/addons/survey/models/survey_survey.py b/addons/survey/models/survey_survey.py index 7a6a73491ed..d11a83fd663 100644 --- a/addons/survey/models/survey_survey.py +++ b/addons/survey/models/survey_survey.py @@ -725,7 +725,7 @@ class Survey(models.Model): 'reward_id': self.certification_badge_id.id, 'state': 'inprogress', 'period': 'once', - 'category': 'certification', + 'challenge_category': 'certification', 'reward_realtime': True, 'report_message_frequency': 'never', 'user_domain': [('karma', '>', 0)], diff --git a/addons/website_forum/data/badges_answer.xml b/addons/website_forum/data/badges_answer.xml index 88e0302f514..712a717c457 100644 --- a/addons/website_forum/data/badges_answer.xml +++ b/addons/website_forum/data/badges_answer.xml @@ -31,7 +31,7 @@ True [('karma', '>', 0)] inprogress - forum + forum @@ -66,7 +66,7 @@ True [('karma', '>', 0)] inprogress - forum + forum @@ -101,7 +101,7 @@ True [('karma', '>', 0)] inprogress - forum + forum @@ -136,7 +136,7 @@ True [('karma', '>', 0)] inprogress - forum + forum @@ -173,7 +173,7 @@ True [('karma', '>', 0)] inprogress - forum + forum @@ -208,7 +208,7 @@ True [('karma', '>', 0)] inprogress - forum + forum @@ -244,7 +244,7 @@ True [('karma', '>', 0)] inprogress - forum + forum diff --git a/addons/website_forum/data/badges_moderation.xml b/addons/website_forum/data/badges_moderation.xml index 9901875305d..65dae67a4a3 100644 --- a/addons/website_forum/data/badges_moderation.xml +++ b/addons/website_forum/data/badges_moderation.xml @@ -38,7 +38,7 @@ True [('karma', '>', 0)] inprogress - forum + forum @@ -74,7 +74,7 @@ True [('karma', '>', 0)] inprogress - forum + forum @@ -110,7 +110,7 @@ True [('karma', '>', 0)] inprogress - forum + forum @@ -145,7 +145,7 @@ True [('karma', '>', 0)] inprogress - forum + forum @@ -181,7 +181,7 @@ True [('karma', '>', 0)] inprogress - forum + forum diff --git a/addons/website_forum/data/badges_participation.xml b/addons/website_forum/data/badges_participation.xml index 88a6ac9b3f5..310f1fb2ab6 100644 --- a/addons/website_forum/data/badges_participation.xml +++ b/addons/website_forum/data/badges_participation.xml @@ -34,7 +34,7 @@ True [('karma', '>', 0)] inprogress - forum + forum @@ -70,7 +70,7 @@ True [('karma', '>', 0)] inprogress - forum + forum @@ -105,7 +105,7 @@ True [('karma', '>', 0)] inprogress - forum + forum @@ -129,7 +129,7 @@ True [('karma', '>', 0)] inprogress - forum + forum @@ -164,7 +164,7 @@ True [('karma', '>', 0)] inprogress - forum + forum diff --git a/addons/website_forum/data/badges_question.xml b/addons/website_forum/data/badges_question.xml index de95e53d12c..ecd45cb4ae3 100644 --- a/addons/website_forum/data/badges_question.xml +++ b/addons/website_forum/data/badges_question.xml @@ -31,7 +31,7 @@ True [('karma', '>', 0)] inprogress - forum + forum @@ -67,7 +67,7 @@ True [('karma', '>', 0)] inprogress - forum + forum @@ -102,7 +102,7 @@ True [('karma', '>', 0)] inprogress - forum + forum @@ -139,7 +139,7 @@ True [('karma', '>', 0)] inprogress - forum + forum @@ -174,7 +174,7 @@ True [('karma', '>', 0)] inprogress - forum + forum @@ -209,7 +209,7 @@ True [('karma', '>', 0)] inprogress - forum + forum @@ -246,7 +246,7 @@ True [('karma', '>', 0)] inprogress - forum + forum @@ -281,7 +281,7 @@ True [('karma', '>', 0)] inprogress - forum + forum @@ -316,7 +316,7 @@ True [('karma', '>', 0)] inprogress - forum + forum @@ -351,7 +351,7 @@ True [('karma', '>', 0)] inprogress - forum + forum @@ -387,7 +387,7 @@ True [('karma', '>', 0)] inprogress - forum + forum diff --git a/addons/website_forum/models/gamification.py b/addons/website_forum/models/gamification.py index 49544fae28f..902b5e0eab9 100644 --- a/addons/website_forum/models/gamification.py +++ b/addons/website_forum/models/gamification.py @@ -7,4 +7,4 @@ from odoo import models, fields class Challenge(models.Model): _inherit = 'gamification.challenge' - category = fields.Selection(selection_add=[('forum', 'Website / Forum')]) + challenge_category = fields.Selection(selection_add=[('forum', 'Website / Forum')]) diff --git a/addons/website_profile/controllers/main.py b/addons/website_profile/controllers/main.py index 858efd34f16..cfe1f5a96a4 100644 --- a/addons/website_profile/controllers/main.py +++ b/addons/website_profile/controllers/main.py @@ -168,7 +168,7 @@ class WebsiteProfile(http.Controller): """ domain = [('website_published', '=', True)] if 'badge_category' in kwargs: - domain = expression.AND([[('challenge_ids.category', '=', kwargs.get('badge_category'))], domain]) + domain = expression.AND([[('challenge_ids.challenge_category', '=', kwargs.get('badge_category'))], domain]) return domain @http.route('/profile/ranks_badges', type='http', auth="public", website=True, sitemap=True) diff --git a/addons/website_slides/controllers/main.py b/addons/website_slides/controllers/main.py index c1a67026b70..d501ff21e2a 100644 --- a/addons/website_slides/controllers/main.py +++ b/addons/website_slides/controllers/main.py @@ -253,7 +253,7 @@ class WebsiteSlides(WebsiteProfile): challenges_done = None else: challenges = request.env['gamification.challenge'].sudo().search([ - ('category', '=', 'slides'), + ('challenge_category', '=', 'slides'), ('reward_id.is_published', '=', True) ], order='id asc', limit=5) challenges_done = request.env['gamification.badge.user'].sudo().search([ diff --git a/addons/website_slides/data/gamification_data.xml b/addons/website_slides/data/gamification_data.xml index 4cb9ce47af7..cefecaac089 100644 --- a/addons/website_slides/data/gamification_data.xml +++ b/addons/website_slides/data/gamification_data.xml @@ -27,7 +27,7 @@ Register to the platform - slides + slides once personal never @@ -69,7 +69,7 @@ Complete your profile - slides + slides once personal never @@ -109,7 +109,7 @@ Complete a course - slides + slides once personal never @@ -150,7 +150,7 @@ Get a certification - slides + slides once personal never @@ -190,7 +190,7 @@ Read 2000 XP - slides + slides once personal never diff --git a/addons/website_slides/models/gamification_challenge.py b/addons/website_slides/models/gamification_challenge.py index aa492e9b7cb..f1346f7ddab 100644 --- a/addons/website_slides/models/gamification_challenge.py +++ b/addons/website_slides/models/gamification_challenge.py @@ -7,4 +7,4 @@ from odoo import models, fields class Challenge(models.Model): _inherit = 'gamification.challenge' - category = fields.Selection(selection_add=[('slides', 'Website / Slides')]) + challenge_category = fields.Selection(selection_add=[('slides', 'Website / Slides')])