From f3d6b67043f12b9d2817db42783718fa249ffaa5 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Thu, 18 Nov 2021 17:18:08 +0100 Subject: [PATCH] [MIG] link_tracker_usability from v10 to v14 Prepare port of mass_mailing_usability... but no real port for the moment --- link_tracker_usability/__init__.py | 1 - link_tracker_usability/__manifest__.py | 7 ++- link_tracker_usability/link_tracker_view.xml | 54 ------------------- .../views/link_tracker_click.xml | 45 ++++++++++++++++ mass_mailing_usability/__init__.py | 5 +- mass_mailing_usability/__manifest__.py | 9 ++-- mass_mailing_usability/link_tracker.py | 14 ----- .../mail_mail_statistics.py | 18 ------- .../link_tracker.xml} | 0 9 files changed, 53 insertions(+), 100 deletions(-) delete mode 100644 link_tracker_usability/link_tracker_view.xml create mode 100644 link_tracker_usability/views/link_tracker_click.xml delete mode 100644 mass_mailing_usability/link_tracker.py delete mode 100644 mass_mailing_usability/mail_mail_statistics.py rename mass_mailing_usability/{link_tracker_view.xml => views/link_tracker.xml} (100%) diff --git a/link_tracker_usability/__init__.py b/link_tracker_usability/__init__.py index 40a96af..e69de29 100644 --- a/link_tracker_usability/__init__.py +++ b/link_tracker_usability/__init__.py @@ -1 +0,0 @@ -# -*- coding: utf-8 -*- diff --git a/link_tracker_usability/__manifest__.py b/link_tracker_usability/__manifest__.py index 1743b06..3ab79e9 100644 --- a/link_tracker_usability/__manifest__.py +++ b/link_tracker_usability/__manifest__.py @@ -1,11 +1,10 @@ -# -*- coding: utf-8 -*- -# Copyright 2019 Akretion (http://www.akretion.com) +# Copyright 2019-2021 Akretion France (http://www.akretion.com) # @author Alexis de Lattre # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { 'name': 'Link Tracker Usability', - 'version': '10.0.1.0.0', + 'version': '14.0.1.0.0', 'category': 'Marketing', 'license': 'AGPL-3', 'summary': 'Improve usability for link tracker', @@ -22,7 +21,7 @@ This module has been written by Alexis de Lattre from Akretion 'website': 'http://www.akretion.com', 'depends': ['link_tracker'], 'data': [ - 'link_tracker_view.xml', + 'views/link_tracker_click.xml', ], 'installable': True, } diff --git a/link_tracker_usability/link_tracker_view.xml b/link_tracker_usability/link_tracker_view.xml deleted file mode 100644 index 8ce636c..0000000 --- a/link_tracker_usability/link_tracker_view.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - graph,tree,form - - - - usability.link.tracker.click.tree - link.tracker.click - - - - - - - - - - usability.link.tracker.click.form - link.tracker.click - - - - - - - - - - - usability.link.tracker.click.search - link.tracker.click - - - - - - - - - - - - - - diff --git a/link_tracker_usability/views/link_tracker_click.xml b/link_tracker_usability/views/link_tracker_click.xml new file mode 100644 index 0000000..5361d2c --- /dev/null +++ b/link_tracker_usability/views/link_tracker_click.xml @@ -0,0 +1,45 @@ + + + + + + + + usability.link.tracker.click.tree + link.tracker.click + + + + + + + + + + usability.link.tracker.click.form + link.tracker.click + + + + + + + + + + usability.link.tracker.click.search + link.tracker.click + + + + + + + + + + diff --git a/mass_mailing_usability/__init__.py b/mass_mailing_usability/__init__.py index dbe2de7..0650744 100644 --- a/mass_mailing_usability/__init__.py +++ b/mass_mailing_usability/__init__.py @@ -1,4 +1 @@ -# -*- coding: utf-8 -*- - -from . import mail_mail_statistics -from . import link_tracker +from . import models diff --git a/mass_mailing_usability/__manifest__.py b/mass_mailing_usability/__manifest__.py index 40c652b..5655183 100644 --- a/mass_mailing_usability/__manifest__.py +++ b/mass_mailing_usability/__manifest__.py @@ -1,11 +1,10 @@ -# -*- coding: utf-8 -*- -# Copyright 2019 Akretion (http://www.akretion.com) +# Copyright 2019-2021 Akretion France (http://www.akretion.com) # @author Alexis de Lattre # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { 'name': 'Mass Mailing Campaigns Usability', - 'version': '10.0.1.0.0', + 'version': '14.0.1.0.0', 'category': 'Marketing', 'license': 'AGPL-3', 'summary': 'Improve usability of mass mailing campaigns', @@ -24,7 +23,7 @@ This module has been written by Alexis de Lattre from Akretion 'website': 'http://www.akretion.com', 'depends': ['mass_mailing', 'link_tracker_usability'], 'data': [ - 'link_tracker_view.xml', +# 'views/link_tracker.xml', ], - 'installable': True, + 'installable': False, } diff --git a/mass_mailing_usability/link_tracker.py b/mass_mailing_usability/link_tracker.py deleted file mode 100644 index e81befe..0000000 --- a/mass_mailing_usability/link_tracker.py +++ /dev/null @@ -1,14 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright 2019 Akretion (http://www.akretion.com) -# @author Alexis de Lattre -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - - -from odoo import fields, models - - -class LinkTrackerClick(models.Model): - _inherit = 'link.tracker.click' - - mail_stat_recipient = fields.Char( - related='mail_stat_id.recipient', store=True) diff --git a/mass_mailing_usability/mail_mail_statistics.py b/mass_mailing_usability/mail_mail_statistics.py deleted file mode 100644 index 35b9e86..0000000 --- a/mass_mailing_usability/mail_mail_statistics.py +++ /dev/null @@ -1,18 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright 2019 Akretion (http://www.akretion.com) -# @author Alexis de Lattre -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - - -from odoo import api, fields, models - - -class MailMailStatistics(models.Model): - _inherit = 'mail.mail.statistics' - - recipient = fields.Char(store=True) - - # add invalidation for 'recipient' field - @api.depends('res_id', 'model') - def _compute_recipient(self): - return super(MailMailStatistics, self)._compute_recipient() diff --git a/mass_mailing_usability/link_tracker_view.xml b/mass_mailing_usability/views/link_tracker.xml similarity index 100% rename from mass_mailing_usability/link_tracker_view.xml rename to mass_mailing_usability/views/link_tracker.xml