pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[REF] gamification, * : rename challenge.category into challenge.challenge_category

Browse Source 
To ease grep in the code, especially that challenge is quite heavily used.

Task ID : 1961053
PR #32594
This commit is contained in:
David Beguin
2019-11-22 14:45:39 +00:00
committed by Thibault Delavallée
parent 6f0d36fa67
commit be3f074a91
16 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/gamification/data/goal_base.xml
+2 -2
View File
@@ -297,7 +297,7 @@ Thank you,
<field name="report_message_frequency">never</field>
<field name="user_domain" eval="str([('groups_id.id', '=', ref('base.group_user'))])" />
<field name="state">inprogress</field>
<field name="category">other</field>
<field name="challenge_category">other</field>
</record>
<record model="gamification.challenge" id="challenge_base_configure">
@@ -307,7 +307,7 @@ Thank you,
<field name="report_message_frequency">never</field>
<field name="user_domain" eval="str([('groups_id.id', '=', ref('base.group_erp_manager'))])" />
<field name="state">inprogress</field>
<field name="category">other</field>
<field name="challenge_category">other</field>
</record>
<!-- lines -->
addons/gamification/models/challenge.py
+1 -1
View File
@@ -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',
addons/gamification/views/challenge.xml
+2 -2
View File
@@ -123,7 +123,7 @@
</div>
</group>
<group string="Category" groups="base.group_no_one">
<field name="category" widget="radio" />
<field name="challenge_category" widget="radio" />
</group>
</page>
</notebook>
@@ -218,7 +218,7 @@
<filter name="inprogress" string="Running Challenges"
domain="[('state', '=', 'inprogress')]"/>
<filter name="hr_challenges" string="HR Challenges"
domain="[('category', '=', 'hr')]"/>
domain="[('challenge_category', '=', 'hr')]"/>
<field name="name"/>
<group expand="0" string="Group By">
<filter string="State" name="state" domain="[]" context="{'group_by':'state'}"/>
addons/hr_gamification/models/hr_employee.py
+2 -2
View File
@@ -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')
addons/hr_gamification/views/gamification_views.xml
+2 -2
View File
@@ -19,7 +19,7 @@
<field name="name">Goals History</field>
<field name="view_mode">tree,kanban</field>
<field name="context">{'search_default_group_by_user': True, 'search_default_group_by_definition': True}</field>
<field name="domain">[('challenge_id.category', '=', 'hr')]</field>
<field name="domain">[('challenge_id.challenge_category', '=', 'hr')]</field>
<field name="help" type="html">
<p class="o_view_nocontent_smiling_face">
Create a new goal
@@ -35,7 +35,7 @@
<field name="name">Challenges</field>
<field name="res_model">gamification.challenge</field>
<field name="view_mode">kanban,tree,form</field>
<field name="domain">[('category', '=', 'hr')]</field>
<field name="domain">[('challenge_category', '=', 'hr')]</field>
<field name="context">{'search_default_inprogress':True, 'default_inprogress':True}</field>
<field name="help" type="html">
<p class="o_view_nocontent_smiling_face">
addons/survey/models/challenge.py
+1 -1
View File
@@ -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')])
addons/survey/models/survey_survey.py
+1 -1
View File
@@ -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)],
addons/website_forum/data/badges_answer.xml
+7 -7
View File
@@ -31,7 +31,7 @@
<field name="reward_realtime">True</field>
<field name="user_domain">[('karma', '>', 0)]</field>
<field name="state">inprogress</field>
<field name="category">forum</field>
<field name="challenge_category">forum</field>
</record>
<record model="gamification.challenge.line" id="line_teacher">
<field name="definition_id" eval="ref('definition_teacher')"/>
@@ -66,7 +66,7 @@
<field name="reward_realtime">True</field>
<field name="user_domain">[('karma', '>', 0)]</field>
<field name="state">inprogress</field>
<field name="category">forum</field>
<field name="challenge_category">forum</field>
</record>
<record model="gamification.challenge.line" id="line_nice_answer">
<field name="definition_id" eval="ref('definition_nice_answer')"/>
@@ -101,7 +101,7 @@
<field name="reward_realtime">True</field>
<field name="user_domain">[('karma', '>', 0)]</field>
<field name="state">inprogress</field>
<field name="category">forum</field>
<field name="challenge_category">forum</field>
</record>
<record model="gamification.challenge.line" id="line_good_answer">
<field name="definition_id" eval="ref('definition_good_answer')"/>
@@ -136,7 +136,7 @@
<field name="reward_realtime">True</field>
<field name="user_domain">[('karma', '>', 0)]</field>
<field name="state">inprogress</field>
<field name="category">forum</field>
<field name="challenge_category">forum</field>
</record>
<record model="gamification.challenge.line" id="line_great_answer">
<field name="definition_id" eval="ref('definition_great_answer')"/>
@@ -173,7 +173,7 @@
<field name="reward_realtime">True</field>
<field name="user_domain">[('karma', '>', 0)]</field>
<field name="state">inprogress</field>
<field name="category">forum</field>
<field name="challenge_category">forum</field>
</record>
<record model="gamification.challenge.line" id="line_enlightened">
<field name="definition_id" eval="ref('definition_enlightened')"/>
@@ -208,7 +208,7 @@
<field name="reward_realtime">True</field>
<field name="user_domain">[('karma', '>', 0)]</field>
<field name="state">inprogress</field>
<field name="category">forum</field>
<field name="challenge_category">forum</field>
</record>
<record model="gamification.challenge.line" id="line_guru">
<field name="definition_id" eval="ref('definition_guru')" />
@@ -244,7 +244,7 @@
<field name="reward_realtime">True</field>
<field name="user_domain">[('karma', '>', 0)]</field>
<field name="state">inprogress</field>
<field name="category">forum</field>
<field name="challenge_category">forum</field>
</record>
<record model="gamification.challenge.line" id="line_self_learner">
<field name="definition_id" eval="ref('definition_self_learner')"/>
addons/website_forum/data/badges_moderation.xml
+5 -5
View File
@@ -38,7 +38,7 @@
<field name="reward_realtime">True</field>
<field name="user_domain">[('karma', '>', 0)]</field>
<field name="state">inprogress</field>
<field name="category">forum</field>
<field name="challenge_category">forum</field>
</record>
<record model="gamification.challenge.line" id="line_critic">
<field name="definition_id" eval="ref('definition_critic')"/>
@@ -74,7 +74,7 @@
<field name="reward_realtime">True</field>
<field name="user_domain">[('karma', '>', 0)]</field>
<field name="state">inprogress</field>
<field name="category">forum</field>
<field name="challenge_category">forum</field>
</record>
<record model="gamification.challenge.line" id="line_disciplined">
<field name="definition_id" eval="ref('definition_disciplined')"/>
@@ -110,7 +110,7 @@
<field name="reward_realtime">True</field>
<field name="user_domain">[('karma', '>', 0)]</field>
<field name="state">inprogress</field>
<field name="category">forum</field>
<field name="challenge_category">forum</field>
</record>
<record model="gamification.challenge.line" id="line_editor">
<field name="definition_id" eval="ref('definition_editor')"/>
@@ -145,7 +145,7 @@
<field name="reward_realtime">True</field>
<field name="user_domain">[('karma', '>', 0)]</field>
<field name="state">inprogress</field>
<field name="category">forum</field>
<field name="challenge_category">forum</field>
</record>
<record model="gamification.challenge.line" id="line_supporter">
<field name="definition_id" eval="ref('definition_supporter')" />
@@ -181,7 +181,7 @@
<field name="reward_realtime">True</field>
<field name="user_domain">[('karma', '>', 0)]</field>
<field name="state">inprogress</field>
<field name="category">forum</field>
<field name="challenge_category">forum</field>
</record>
<record model="gamification.challenge.line" id="line_peer_pressure">
<field name="definition_id" eval="ref('definition_peer_pressure')" />
addons/website_forum/data/badges_participation.xml
+5 -5
View File
@@ -34,7 +34,7 @@
<field name="reward_realtime">True</field>
<field name="user_domain">[('karma', '>', 0)]</field>
<field name="state">inprogress</field>
<field name="category">forum</field>
<field name="challenge_category">forum</field>
</record>
<record model="gamification.challenge.line" id="line_configure_profile">
<field name="definition_id" eval="ref('definition_configure_profile')"/>
@@ -70,7 +70,7 @@
<field name="reward_realtime">True</field>
<field name="user_domain">[('karma', '>', 0)]</field>
<field name="state">inprogress</field>
<field name="category">forum</field>
<field name="challenge_category">forum</field>
</record>
<record model="gamification.challenge.line" id="line_commentator">
<field name="definition_id" eval="ref('definition_commentator')"/>
@@ -105,7 +105,7 @@
<field name="reward_realtime">True</field>
<field name="user_domain">[('karma', '>', 0)]</field>
<field name="state">inprogress</field>
<field name="category">forum</field>
<field name="challenge_category">forum</field>
</record>
<record model="gamification.challenge.line" id="line_pundit">
<field name="definition_id" eval="ref('definition_pundit')" />
@@ -129,7 +129,7 @@
<field name="reward_realtime">True</field>
<field name="user_domain">[('karma', '>', 0)]</field>
<field name="state">inprogress</field>
<field name="category">forum</field>
<field name="challenge_category">forum</field>
</record>
<record model="gamification.challenge.line" id="line_chief_commentator">
<field name="definition_id" eval="ref('definition_commentator')"/>
@@ -164,7 +164,7 @@
<field name="reward_realtime">True</field>
<field name="user_domain">[('karma', '>', 0)]</field>
<field name="state">inprogress</field>
<field name="category">forum</field>
<field name="challenge_category">forum</field>
</record>
<record model="gamification.challenge.line" id="line_taxonomist">
<field name="definition_id" eval="ref('definition_taxonomist')" />
addons/website_forum/data/badges_question.xml
+11 -11
View File
@@ -31,7 +31,7 @@
<field name="reward_realtime">True</field>
<field name="user_domain">[('karma', '>', 0)]</field>
<field name="state">inprogress</field>
<field name="category">forum</field>
<field name="challenge_category">forum</field>
</record>
<record model="gamification.challenge.line" id="line_popular_question">
<field name="definition_id" eval="ref('definition_popular_question')"/>
@@ -67,7 +67,7 @@
<field name="reward_realtime">True</field>
<field name="user_domain">[('karma', '>', 0)]</field>
<field name="state">inprogress</field>
<field name="category">forum</field>
<field name="challenge_category">forum</field>
</record>
<record model="gamification.challenge.line" id="line_notable_question">
<field name="definition_id" eval="ref('definition_notable_question')"/>
@@ -102,7 +102,7 @@
<field name="reward_realtime">True</field>
<field name="user_domain">[('karma', '>', 0)]</field>
<field name="state">inprogress</field>
<field name="category">forum</field>
<field name="challenge_category">forum</field>
</record>
<record model="gamification.challenge.line" id="line_famous_question">
<field name="definition_id" eval="ref('definition_famous_question')"/>
@@ -139,7 +139,7 @@
<field name="reward_realtime">True</field>
<field name="user_domain">[('karma', '>', 0)]</field>
<field name="state">inprogress</field>
<field name="category">forum</field>
<field name="challenge_category">forum</field>
</record>
<record model="gamification.challenge.line" id="line_favorite_question_1">
<field name="definition_id" eval="ref('definition_favorite_question_1')"/>
@@ -174,7 +174,7 @@
<field name="reward_realtime">True</field>
<field name="user_domain">[('karma', '>', 0)]</field>
<field name="state">inprogress</field>
<field name="category">forum</field>
<field name="challenge_category">forum</field>
</record>
<record model="gamification.challenge.line" id="line_favorite_question_5">
<field name="definition_id" eval="ref('definition_favorite_question_5')"/>
@@ -209,7 +209,7 @@
<field name="reward_realtime">True</field>
<field name="user_domain">[('karma', '>', 0)]</field>
<field name="state">inprogress</field>
<field name="category">forum</field>
<field name="challenge_category">forum</field>
</record>
<record model="gamification.challenge.line" id="line_stellar_question_25">
<field name="definition_id" eval="ref('definition_stellar_question_25')"/>
@@ -246,7 +246,7 @@
<field name="reward_realtime">True</field>
<field name="user_domain">[('karma', '>', 0)]</field>
<field name="state">inprogress</field>
<field name="category">forum</field>
<field name="challenge_category">forum</field>
</record>
<record model="gamification.challenge.line" id="line_student">
<field name="definition_id" eval="ref('definition_student')"/>
@@ -281,7 +281,7 @@
<field name="reward_realtime">True</field>
<field name="user_domain">[('karma', '>', 0)]</field>
<field name="state">inprogress</field>
<field name="category">forum</field>
<field name="challenge_category">forum</field>
</record>
<record model="gamification.challenge.line" id="line_nice_question">
<field name="definition_id" eval="ref('definition_nice_question')"/>
@@ -316,7 +316,7 @@
<field name="reward_realtime">True</field>
<field name="user_domain">[('karma', '>', 0)]</field>
<field name="state">inprogress</field>
<field name="category">forum</field>
<field name="challenge_category">forum</field>
</record>
<record model="gamification.challenge.line" id="line_good_question">
<field name="definition_id" eval="ref('definition_good_question')"/>
@@ -351,7 +351,7 @@
<field name="reward_realtime">True</field>
<field name="user_domain">[('karma', '>', 0)]</field>
<field name="state">inprogress</field>
<field name="category">forum</field>
<field name="challenge_category">forum</field>
</record>
<record model="gamification.challenge.line" id="line_great_question">
<field name="definition_id" eval="ref('definition_great_question')" />
@@ -387,7 +387,7 @@
<field name="reward_realtime">True</field>
<field name="user_domain">[('karma', '>', 0)]</field>
<field name="state">inprogress</field>
<field name="category">forum</field>
<field name="challenge_category">forum</field>
</record>
<record model="gamification.challenge.line" id="line_scholar">
<field name="definition_id" eval="ref('definition_scholar')" />
addons/website_forum/models/gamification.py
+1 -1
View File
@@ -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')])
addons/website_profile/controllers/main.py
+1 -1
View File
@@ -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)
addons/website_slides/controllers/main.py
+1 -1
View File
@@ -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([
addons/website_slides/data/gamification_data.xml
+5 -5
View File
@@ -27,7 +27,7 @@
</record>
<record id="badge_data_register_challenge" model="gamification.challenge">
<field name="name">Register to the platform</field>
<field name="category">slides</field>
<field name="challenge_category">slides</field>
<field name="period">once</field>
<field name="visibility_mode">personal</field>
<field name="report_message_frequency">never</field>
@@ -69,7 +69,7 @@
</record>
<record id="badge_data_profile_challenge" model="gamification.challenge">
<field name="name">Complete your profile</field>
<field name="category">slides</field>
<field name="challenge_category">slides</field>
<field name="period">once</field>
<field name="visibility_mode">personal</field>
<field name="report_message_frequency">never</field>
@@ -109,7 +109,7 @@
</record>
<record id="badge_data_course_challenge" model="gamification.challenge">
<field name="name">Complete a course</field>
<field name="category">slides</field>
<field name="challenge_category">slides</field>
<field name="period">once</field>
<field name="visibility_mode">personal</field>
<field name="report_message_frequency">never</field>
@@ -150,7 +150,7 @@
</record>
<record id="badge_data_certification_challenge" model="gamification.challenge">
<field name="name">Get a certification</field>
<field name="category">slides</field>
<field name="challenge_category">slides</field>
<field name="period">once</field>
<field name="visibility_mode">personal</field>
<field name="report_message_frequency">never</field>
@@ -190,7 +190,7 @@
</record>
<record id="badge_data_karma_challenge" model="gamification.challenge">
<field name="name">Read 2000 XP</field>
<field name="category">slides</field>
<field name="challenge_category">slides</field>
<field name="period">once</field>
<field name="visibility_mode">personal</field>
<field name="report_message_frequency">never</field>
addons/website_slides/models/gamification_challenge.py
+1 -1
View File
@@ -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')])