From 7db596fdb2522baba5612015b3ee5d88541c6efc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 20 Jan 2022 08:35:27 +0000 Subject: [PATCH] [MOV] utm: split views in different files Purpose ======= This commit cleans the UTM module and uses a different file for each model views in order to clarify organization and ease reading. Each model owns its own view file. Task-2245823 Part-of: odoo/odoo#83070 --- addons/utm/__manifest__.py | 6 +- addons/utm/models/ir_http.py | 2 + addons/utm/models/utm_campaign.py | 1 - addons/utm/views/utm_campaign_views.xml | 59 ++-------- addons/utm/views/utm_medium_views.xml | 54 ++++++++++ addons/utm/views/utm_menus.xml | 31 ++++++ addons/utm/views/utm_source_views.xml | 39 +++++++ addons/utm/views/utm_stage_views.xml | 37 +++++++ addons/utm/views/utm_tag_views.xml | 24 +++++ addons/utm/views/utm_views.xml | 138 ------------------------ 10 files changed, 199 insertions(+), 192 deletions(-) create mode 100644 addons/utm/views/utm_medium_views.xml create mode 100644 addons/utm/views/utm_menus.xml create mode 100644 addons/utm/views/utm_source_views.xml create mode 100644 addons/utm/views/utm_stage_views.xml create mode 100644 addons/utm/views/utm_tag_views.xml delete mode 100644 addons/utm/views/utm_views.xml diff --git a/addons/utm/__manifest__.py b/addons/utm/__manifest__.py index c7039a22f1c..ff825f2ba87 100644 --- a/addons/utm/__manifest__.py +++ b/addons/utm/__manifest__.py @@ -12,7 +12,11 @@ Enable management of UTM trackers: campaign, medium, source. 'data': [ 'data/utm_data.xml', 'views/utm_campaign_views.xml', - 'views/utm_views.xml', + 'views/utm_medium_views.xml', + 'views/utm_source_views.xml', + 'views/utm_stage_views.xml', + 'views/utm_tag_views.xml', + 'views/utm_menus.xml', 'security/ir.model.access.csv', ], 'demo': [ diff --git a/addons/utm/models/ir_http.py b/addons/utm/models/ir_http.py index 7de6922c3b6..b087dca72ef 100644 --- a/addons/utm/models/ir_http.py +++ b/addons/utm/models/ir_http.py @@ -1,4 +1,6 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + from odoo.http import request from odoo import models diff --git a/addons/utm/models/utm_campaign.py b/addons/utm/models/utm_campaign.py index c3e729a2c5c..fd4cc6a01e9 100644 --- a/addons/utm/models/utm_campaign.py +++ b/addons/utm/models/utm_campaign.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. - from odoo import fields, models, api, SUPERUSER_ID diff --git a/addons/utm/views/utm_campaign_views.xml b/addons/utm/views/utm_campaign_views.xml index ae5025769ff..6c2f58d78e5 100644 --- a/addons/utm/views/utm_campaign_views.xml +++ b/addons/utm/views/utm_campaign_views.xml @@ -121,61 +121,16 @@ - - - utm.tag.view.tree - utm.tag - - - - - - - - - Campaign Tags - utm.tag + + Campaigns + utm.campaign + tree,kanban,form

- Create a Tag -

- Assign tags to your campaigns to organize, filter and track them. + Create a campaign

-
-
- - - - utm.stage.view.search - utm.stage - - - - - - - - - utm.stage.view.tree - utm.stage - 10 - - - - - - - - - - UTM Stages - utm.stage - tree,form - -

- Create a stage for your campaigns -

- Stages allow you to organize your workflow (e.g. : plan, design, in progress, done, …). +

+ Campaigns are used to centralize your marketing efforts and track their results.

diff --git a/addons/utm/views/utm_medium_views.xml b/addons/utm/views/utm_medium_views.xml new file mode 100644 index 00000000000..394bca00436 --- /dev/null +++ b/addons/utm/views/utm_medium_views.xml @@ -0,0 +1,54 @@ + + + + utm.medium.view.tree + utm.medium + + + + + + + + + + utm.medium.view.form + utm.medium + +
+ + + + + + +
+
+
+ + + utm.medium.view.search + utm.medium + + + + + + + + + + + Mediums + utm.medium + tree,form + + +

+ Create a Medium +

+ UTM Mediums track the mean that was used to attract traffic (e.g. "Website", "Twitter", ...). +

+
+
+
diff --git a/addons/utm/views/utm_menus.xml b/addons/utm/views/utm_menus.xml new file mode 100644 index 00000000000..7743723c576 --- /dev/null +++ b/addons/utm/views/utm_menus.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + diff --git a/addons/utm/views/utm_source_views.xml b/addons/utm/views/utm_source_views.xml new file mode 100644 index 00000000000..af2fee6fa08 --- /dev/null +++ b/addons/utm/views/utm_source_views.xml @@ -0,0 +1,39 @@ + + + + utm.source.view.tree + utm.source + + + + + + + + + utm.source.view.form + utm.source + +
+ + + + + +
+
+
+ + + Sources + utm.source + tree,form + +

+ No Sources yet! +

+ UTM Sources track where traffic comes from (e.g. "May Newsletter", "", ...). +

+
+
+
diff --git a/addons/utm/views/utm_stage_views.xml b/addons/utm/views/utm_stage_views.xml new file mode 100644 index 00000000000..44dcb39b6b8 --- /dev/null +++ b/addons/utm/views/utm_stage_views.xml @@ -0,0 +1,37 @@ + + + + utm.stage.view.search + utm.stage + + + + + + + + + utm.stage.view.tree + utm.stage + 10 + + + + + + + + + + UTM Stages + utm.stage + tree,form + +

+ Create a stage for your campaigns +

+ Stages allow you to organize your workflow (e.g. : plan, design, in progress, done, …). +

+
+
+
diff --git a/addons/utm/views/utm_tag_views.xml b/addons/utm/views/utm_tag_views.xml new file mode 100644 index 00000000000..f5f18c3ce93 --- /dev/null +++ b/addons/utm/views/utm_tag_views.xml @@ -0,0 +1,24 @@ + + + + utm.tag.view.tree + utm.tag + + + + + + + + + Campaign Tags + utm.tag + +

+ Create a Tag +

+ Assign tags to your campaigns to organize, filter and track them. +

+
+
+
diff --git a/addons/utm/views/utm_views.xml b/addons/utm/views/utm_views.xml deleted file mode 100644 index 16d81241acd..00000000000 --- a/addons/utm/views/utm_views.xml +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - - - Campaigns - utm.campaign - tree,kanban,form - -

- Create a campaign -

-

- Campaigns are used to centralize your marketing efforts and track their results. -

-
-
- - - - - - utm.medium.view.tree - utm.medium - - - - - - - - - - utm.medium.view.form - utm.medium - -
- - - - - - -
-
-
- - - utm.medium.view.search - utm.medium - - - - - - - - - - - Mediums - utm.medium - tree,form - - -

- Create a Medium -

- UTM Mediums track the mean that was used to attract traffic (e.g. "Website", "Twitter", ...). -

-
-
- - - - - - utm.source.view.tree - utm.source - - - - - - - - - utm.source.view.form - utm.source - -
- - - - - -
-
-
- - - Sources - utm.source - tree,form - -

- No Sources yet! -

- UTM Sources track where traffic comes from (e.g. "May Newsletter", "", ...). -

-
-
- - - -