From 7bd5b64f679d443dc9c7875d8a9fc815d832b524 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 20 Jan 2022 08:39:35 +0000 Subject: [PATCH] [MOV] utm: split data and demo in different files Purpose ======= This commit cleans the UTM module and uses a different file for each model data and demo in order to clarify organization and ease reading. Each model owns its own demo and data file. Security file is reorganized per model. Task-2245823 Part-of: odoo/odoo#83070 --- addons/utm/__manifest__.py | 8 +- .../{utm_demo.xml => utm_campaign_demo.xml} | 15 ---- addons/utm/data/utm_data.xml | 77 ------------------- addons/utm/data/utm_medium_data.xml | 33 ++++++++ addons/utm/data/utm_source_data.xml | 30 ++++++++ addons/utm/data/utm_stage_data.xml | 9 +++ addons/utm/data/utm_stage_demo.xml | 17 ++++ addons/utm/data/utm_tag_data.xml | 8 ++ addons/utm/security/ir.model.access.csv | 6 +- 9 files changed, 106 insertions(+), 97 deletions(-) rename addons/utm/data/{utm_demo.xml => utm_campaign_demo.xml} (67%) delete mode 100644 addons/utm/data/utm_data.xml create mode 100644 addons/utm/data/utm_medium_data.xml create mode 100644 addons/utm/data/utm_source_data.xml create mode 100644 addons/utm/data/utm_stage_data.xml create mode 100644 addons/utm/data/utm_stage_demo.xml create mode 100644 addons/utm/data/utm_tag_data.xml diff --git a/addons/utm/__manifest__.py b/addons/utm/__manifest__.py index ff825f2ba87..25fd0535454 100644 --- a/addons/utm/__manifest__.py +++ b/addons/utm/__manifest__.py @@ -10,7 +10,10 @@ Enable management of UTM trackers: campaign, medium, source. 'version': '1.1', 'depends': ['base', 'web'], 'data': [ - 'data/utm_data.xml', + 'data/utm_medium_data.xml', + 'data/utm_source_data.xml', + 'data/utm_stage_data.xml', + 'data/utm_tag_data.xml', 'views/utm_campaign_views.xml', 'views/utm_medium_views.xml', 'views/utm_source_views.xml', @@ -20,7 +23,8 @@ Enable management of UTM trackers: campaign, medium, source. 'security/ir.model.access.csv', ], 'demo': [ - 'data/utm_demo.xml', + 'data/utm_campaign_demo.xml', + 'data/utm_stage_demo.xml', ], 'auto_install': False, 'assets': { diff --git a/addons/utm/data/utm_demo.xml b/addons/utm/data/utm_campaign_demo.xml similarity index 67% rename from addons/utm/data/utm_demo.xml rename to addons/utm/data/utm_campaign_demo.xml index 3ea8b30b0d1..32c0e3d64d8 100644 --- a/addons/utm/data/utm_demo.xml +++ b/addons/utm/data/utm_campaign_demo.xml @@ -1,21 +1,6 @@ - - - Schedule - 10 - - - Design - 20 - - - Sent - 30 - - - Sale diff --git a/addons/utm/data/utm_data.xml b/addons/utm/data/utm_data.xml deleted file mode 100644 index b9fb8274a31..00000000000 --- a/addons/utm/data/utm_data.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - New - 10 - - - - - Search engine - - - Lead Recall - - - Newsletter - - - Facebook - - - Twitter - - - LinkedIn - - - Monster - - - Glassdoor - - - Craigslist - - - - - Website - - - Phone - - - Direct - - - Email - - - Banner - - - Twitter - - - Facebook - - - LinkedIn - - - Television - - - Google Adwords - - - - - Marketing - - - diff --git a/addons/utm/data/utm_medium_data.xml b/addons/utm/data/utm_medium_data.xml new file mode 100644 index 00000000000..432ea9dcd4c --- /dev/null +++ b/addons/utm/data/utm_medium_data.xml @@ -0,0 +1,33 @@ + + + + Website + + + Phone + + + Direct + + + Email + + + Banner + + + Twitter + + + Facebook + + + LinkedIn + + + Television + + + Google Adwords + + diff --git a/addons/utm/data/utm_source_data.xml b/addons/utm/data/utm_source_data.xml new file mode 100644 index 00000000000..b8dcd7cb9ce --- /dev/null +++ b/addons/utm/data/utm_source_data.xml @@ -0,0 +1,30 @@ + + + + Search engine + + + Lead Recall + + + Newsletter + + + Facebook + + + Twitter + + + LinkedIn + + + Monster + + + Glassdoor + + + Craigslist + + diff --git a/addons/utm/data/utm_stage_data.xml b/addons/utm/data/utm_stage_data.xml new file mode 100644 index 00000000000..87e7e7c0874 --- /dev/null +++ b/addons/utm/data/utm_stage_data.xml @@ -0,0 +1,9 @@ + + + + + New + 10 + + diff --git a/addons/utm/data/utm_stage_demo.xml b/addons/utm/data/utm_stage_demo.xml new file mode 100644 index 00000000000..979511e60b7 --- /dev/null +++ b/addons/utm/data/utm_stage_demo.xml @@ -0,0 +1,17 @@ + + + + + Schedule + 10 + + + Design + 20 + + + Sent + 30 + + + diff --git a/addons/utm/data/utm_tag_data.xml b/addons/utm/data/utm_tag_data.xml new file mode 100644 index 00000000000..30775283505 --- /dev/null +++ b/addons/utm/data/utm_tag_data.xml @@ -0,0 +1,8 @@ + + + + + Marketing + + + diff --git a/addons/utm/security/ir.model.access.csv b/addons/utm/security/ir.model.access.csv index a4e493e0edb..2cc52c0dd1d 100644 --- a/addons/utm/security/ir.model.access.csv +++ b/addons/utm/security/ir.model.access.csv @@ -1,14 +1,14 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_utm_campaign,access_utm_campaign,model_utm_campaign,,1,0,1,0 access_utm_campaign_user,access_utm_campaign_user,model_utm_campaign,base.group_user,1,1,1,0 access_utm_campaign_system,utm.campaign.system,model_utm_campaign,base.group_system,1,1,1,1 +access_utm_medium,access_utm_medium,model_utm_medium,,1,0,1,0 access_utm_medium_user,access_utm_medium_user,model_utm_medium,base.group_user,1,1,1,0 access_utm_medium_system,utm.medium.system,model_utm_medium,base.group_system,1,1,1,1 +access_utm_source,access_utm_source,model_utm_source,,1,0,1,0 access_utm_source_user,access_utm_source_user,model_utm_source,base.group_user,1,1,1,0 access_utm_source_system,utm.source.system,model_utm_source,base.group_system,1,1,1,1 access_utm_stage_user,mail.utm.stage,model_utm_stage,base.group_user,1,0,0,0 access_utm_stage_system,mail.utm.stage,model_utm_stage,base.group_system,1,1,1,1 -access_utm_campaign,access_utm_campaign,model_utm_campaign,,1,0,1,0 -access_utm_medium,access_utm_medium,model_utm_medium,,1,0,1,0 -access_utm_source,access_utm_source,model_utm_source,,1,0,1,0 access_utm_tag_user,utm.tag,model_utm_tag,base.group_user,1,0,0,0 access_utm_tag_system,utm.tag,model_utm_tag,base.group_system,1,1,1,1