diff options
| author | David Beguin <dbe@odoo.com> | 2019-10-31 16:21:30 +0000 |
|---|---|---|
| committer | Thibault Delavallée <tde@odoo.com> | 2019-11-22 14:45:39 +0000 |
| commit | be3f074a910a76275ebaa576dc57f9b72f5ad4ae (patch) | |
| tree | 4eb6bf32e9cc05f0590cc2d2741dccdd373a0923 /addons/gamification | |
| parent | 6f0d36fa67c91d0bd70cf092bd1d41c615e1e8be (diff) | |
[REF] gamification, * : rename challenge.category into challenge.challenge_category
To ease grep in the code, especially that challenge is quite heavily used.
Task ID : 1961053
PR #32594
Diffstat (limited to 'addons/gamification')
| -rw-r--r-- | addons/gamification/data/goal_base.xml | 4 | ||||
| -rw-r--r-- | addons/gamification/models/challenge.py | 2 | ||||
| -rw-r--r-- | addons/gamification/views/challenge.xml | 4 |
3 files changed, 5 insertions, 5 deletions
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, <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 --> 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 @@ </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'}"/> |