From 3fe3c7a234233a4f0b7e7742cf0a321d24abc982 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@odoo.com>
Date: Wed, 10 Nov 2021 11:02:44 +0000
Subject: [PATCH] [MOV] gamification: reorder and rename data files

Purpose of this commit is to rename and reorder data by main model. It
allows to better understand module organization and find data one may have
to update.

Task-2678295

Part-of: odoo/odoo#79599
---
 addons/gamification/__manifest__.py                    |  8 ++++----
 .../data/{badge.xml => gamification_badge_data.xml}    |  0
 .../{goal_base.xml => gamification_challenge_data.xml} | 10 ----------
 .../gamification/data/{cron.xml => ir_cron_data.xml}   |  0
 addons/gamification/views/res_users_views.xml          | 10 ++++++++++
 5 files changed, 14 insertions(+), 14 deletions(-)
 rename addons/gamification/data/{badge.xml => gamification_badge_data.xml} (100%)
 rename addons/gamification/data/{goal_base.xml => gamification_challenge_data.xml} (87%)
 rename addons/gamification/data/{cron.xml => ir_cron_data.xml} (100%)

diff --git a/addons/gamification/__manifest__.py b/addons/gamification/__manifest__.py
index 84bd41c577e..9b99964392a 100644
--- a/addons/gamification/__manifest__.py
+++ b/addons/gamification/__manifest__.py
@@ -32,12 +32,12 @@ Both goals and badges are flexibles and can be adapted to a large range of modul
         'views/gamification_challenge_views.xml',
         'views/gamification_challenge_line_views.xml',
         'views/gamification_menus.xml',
-        'data/cron.xml',
         'security/gamification_security.xml',
         'security/ir.model.access.csv',
-        'data/mail_template_data.xml',
-        'data/goal_base.xml',
-        'data/badge.xml',
+        'data/ir_cron_data.xml',
+        'data/mail_template_data.xml',  # keep before to populate challenge reports
+        'data/gamification_badge_data.xml',
+        'data/gamification_challenge_data.xml',
         'data/gamification_karma_rank_data.xml',
     ],
     'demo': [
diff --git a/addons/gamification/data/badge.xml b/addons/gamification/data/gamification_badge_data.xml
similarity index 100%
rename from addons/gamification/data/badge.xml
rename to addons/gamification/data/gamification_badge_data.xml
diff --git a/addons/gamification/data/goal_base.xml b/addons/gamification/data/gamification_challenge_data.xml
similarity index 87%
rename from addons/gamification/data/goal_base.xml
rename to addons/gamification/data/gamification_challenge_data.xml
index 06ba1f0d936..90be06389e6 100644
--- a/addons/gamification/data/goal_base.xml
+++ b/addons/gamification/data/gamification_challenge_data.xml
@@ -38,16 +38,6 @@
             <field name="res_id_field">user.company_id.id</field>
         </record>
 
-        <record id="action_new_simplified_res_users" model="ir.actions.act_window">
-            <field name="name">Create User</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">res.users</field>
-            <field name="target">current</field>
-            <field name="view_id" ref="base.view_users_simple_form"/>
-            <field name="context">{}</field>
-            <field name="help">Create and manage users that will connect to the system. Users can be deactivated should there be a period of time during which they will/should not connect to the system. You can assign them groups in order to give them specific access to the applications they need to use in the system.</field>
-        </record>
-
         <record model="gamification.goal.definition" id="definition_base_invite">
             <field name="name">Invite new Users</field>
             <field name="description">Create at least another user</field>
diff --git a/addons/gamification/data/cron.xml b/addons/gamification/data/ir_cron_data.xml
similarity index 100%
rename from addons/gamification/data/cron.xml
rename to addons/gamification/data/ir_cron_data.xml
diff --git a/addons/gamification/views/res_users_views.xml b/addons/gamification/views/res_users_views.xml
index 8144105ef20..f1e9f085714 100644
--- a/addons/gamification/views/res_users_views.xml
+++ b/addons/gamification/views/res_users_views.xml
@@ -21,5 +21,15 @@
         <field name="domain">[('rank_id', '=', active_id)]</field>
     </record>
 
+    <record id="action_new_simplified_res_users" model="ir.actions.act_window">
+        <field name="name">Create User</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">res.users</field>
+        <field name="target">current</field>
+        <field name="view_id" ref="base.view_users_simple_form"/>
+        <field name="context">{}</field>
+        <field name="help">Create and manage users that will connect to the system. Users can be deactivated should there be a period of time during which they will/should not connect to the system. You can assign them groups in order to give them specific access to the applications they need to use in the system.</field>
+    </record>
+
 </data>
 </odoo>