diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-09-13 13:32:51 +0000 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-09-13 13:32:51 +0000 |
| commit | 5a273e74f0fff18df5ab6cb240c9e260be4bb7ff (patch) | |
| tree | 4fbc7e142335d110fa0a984ff2c345a487e37ca4 /addons/gamification/views | |
| parent | dc5f83b63313018999b598210b972636986c5bea (diff) | |
| parent | fe59754c5201f9392b75d5d4cce8ca1400a7ef5d (diff) | |
[MERGE] forward port branch saas-12.4 up to fe59754c520
closes odoo/odoo#36721
Signed-off-by: Christophe Simonis <chs@odoo.com>
Diffstat (limited to 'addons/gamification/views')
| -rw-r--r-- | addons/gamification/views/challenge.xml | 6 | ||||
| -rw-r--r-- | addons/gamification/views/goal.xml | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/addons/gamification/views/challenge.xml b/addons/gamification/views/challenge.xml index 745a9b5204c..48214d14774 100644 --- a/addons/gamification/views/challenge.xml +++ b/addons/gamification/views/challenge.xml @@ -15,7 +15,7 @@ <record id="goals_from_challenge_act" model="ir.actions.act_window"> <field name="res_model">gamification.goal</field> <field name="name">Related Goals</field> - <field name="view_mode">kanban,tree</field> + <field name="view_mode">kanban,tree,form</field> <field name="context">{'search_default_group_by_definition': True, 'search_default_inprogress': True, 'search_default_challenge_id': active_id, 'default_challenge_id': active_id}</field> <field name="help" type="html"> <p class="o_view_nocontent_empty_folder"> @@ -61,7 +61,7 @@ <label for="user_domain" class="oe_edit_only" string="Assign Challenge To"/> <div> <field name="user_domain" widget="domain" options="{'model': 'res.users'}" /> - <field name="user_ids" groups="base.group_no_one" widget="many2many_tags" readonly="True" /> + <field name="user_ids" widget="many2many_tags" /> </div> </div> @@ -171,7 +171,7 @@ <record id="challenge_list_action" model="ir.actions.act_window"> <field name="name">Challenges</field> <field name="res_model">gamification.challenge</field> - <field name="view_mode">kanban,tree,form</field> + <field name="view_mode">kanban,tree</field> <field name="context">{'search_default_inprogress':True, 'default_inprogress':True}</field> <field name="help" type="html"> <p class="o_view_nocontent_smiling_face"> diff --git a/addons/gamification/views/goal.xml b/addons/gamification/views/goal.xml index f571e28a4ec..26409c21306 100644 --- a/addons/gamification/views/goal.xml +++ b/addons/gamification/views/goal.xml @@ -135,6 +135,7 @@ <field name="completeness"/> <field name="state"/> <field name="target_goal"/> + <field name="definition_description"/> <field name="definition_condition"/> <field name="definition_suffix"/> <field name="definition_display"/> @@ -143,10 +144,12 @@ <field name="last_update"/> <templates> <t t-name="kanban-tooltip"> - <field name="definition_description"/> + <ul class="oe_kanban_tooltip"> + <li><t t-esc="record.definition_description.value" /></li> + </ul> </t> <t t-name="kanban-box"> - <div t-attf-class="oe_kanban_card o_kanban_gamification #{record.end_date.raw_value < record.last_update.raw_value & record.state.raw_value == 'failed' ? 'oe_kanban_color_2' : ''} #{record.end_date.raw_value < record.last_update.raw_value & record.state.raw_value == 'reached' ? 'oe_kanban_color_5' : ''}"> + <div t-attf-class="oe_kanban_card oe_kanban_global_click o_kanban_gamification #{record.end_date.raw_value < record.last_update.raw_value & record.state.raw_value == 'failed' ? 'oe_kanban_color_2' : ''} #{record.end_date.raw_value < record.last_update.raw_value & record.state.raw_value == 'reached' ? 'oe_kanban_color_5' : ''}"> <div class="o_kanban_content"> <p><strong><h4 class="oe_goal_name text-center" tooltip="kanban-tooltip"><field name="definition_id" /></h4></strong></p> <div class="float-left"> |