From 5f61826c3609a17080ca9ae72951e9655136b51c Mon Sep 17 00:00:00 2001 From: Joan Mateu Jordi Date: Tue, 16 Nov 2021 08:39:06 +0100 Subject: [PATCH] [IMP] mail_activity_creator black, isort, prettier --- mail_activity_creator/__manifest__.py | 24 +++----- mail_activity_creator/models/mail_activity.py | 6 +- .../static/src/xml/activity.xml | 14 +++-- mail_activity_creator/tests/test_creator.py | 57 +++++++++++-------- .../views/mail_activity_views.xml | 6 +- 5 files changed, 56 insertions(+), 51 deletions(-) diff --git a/mail_activity_creator/__manifest__.py b/mail_activity_creator/__manifest__.py index e6f0750..d1b5ad4 100644 --- a/mail_activity_creator/__manifest__.py +++ b/mail_activity_creator/__manifest__.py @@ -2,20 +2,14 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { - 'name': 'Mail Activity Creator', - 'summary': """ + "name": "Mail Activity Creator", + "summary": """ Show activities creator""", - 'version': '11.0.1.0.0', - 'license': 'AGPL-3', - 'author': 'Creu Blanca,Odoo Community Association (OCA)', - 'website': 'https://github.com/OCA/social', - 'depends': [ - 'mail' - ], - 'data': [ - 'views/mail_activity_views.xml', - ], - 'qweb': [ - 'static/src/xml/activity.xml', - ], + "version": "11.0.1.0.0", + "license": "AGPL-3", + "author": "Creu Blanca,Odoo Community Association (OCA)", + "website": "https://github.com/OCA/social", + "depends": ["mail"], + "data": ["views/mail_activity_views.xml"], + "qweb": ["static/src/xml/activity.xml"], } diff --git a/mail_activity_creator/models/mail_activity.py b/mail_activity_creator/models/mail_activity.py index 2ed9e13..425f434 100644 --- a/mail_activity_creator/models/mail_activity.py +++ b/mail_activity_creator/models/mail_activity.py @@ -6,10 +6,8 @@ from odoo import fields, models class MailActivity(models.Model): - _inherit = 'mail.activity' + _inherit = "mail.activity" creator_uid = fields.Many2one( - 'res.users', - default=lambda r: r.env.user.id, - string="Creator", + "res.users", default=lambda r: r.env.user.id, string="Creator", ) diff --git a/mail_activity_creator/static/src/xml/activity.xml b/mail_activity_creator/static/src/xml/activity.xml index fabef43..5877b16 100644 --- a/mail_activity_creator/static/src/xml/activity.xml +++ b/mail_activity_creator/static/src/xml/activity.xml @@ -1,12 +1,18 @@ - +
Creator
- - + +
diff --git a/mail_activity_creator/tests/test_creator.py b/mail_activity_creator/tests/test_creator.py index 6fddb61..b52d14d 100644 --- a/mail_activity_creator/tests/test_creator.py +++ b/mail_activity_creator/tests/test_creator.py @@ -1,38 +1,45 @@ # Copyright 2020 Creu Blanca # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from odoo.tests.common import TransactionCase from odoo.models import SUPERUSER_ID +from odoo.tests.common import TransactionCase class TestCreator(TransactionCase): - def setUp(self): super().setUp() - self.partner = self.env['res.partner'].create({ - 'name': 'DEMO' - }) - self.user_01 = self.env['res.users'].create({ - 'name': 'user_01', - 'login': 'demo_user_01', - 'email': 'demo@demo.de', - 'notification_type': 'inbox', - }) - self.model_id = self.env['ir.model']._get('res.partner').id - self.activity_type = self.env['mail.activity.type'].create({ - 'name': 'Initial Contact', - 'days': 5, - 'summary': 'ACT 1 : Presentation, barbecue, ... ', - 'res_model_id': self.model_id, - }) + self.partner = self.env["res.partner"].create({"name": "DEMO"}) + self.user_01 = self.env["res.users"].create( + { + "name": "user_01", + "login": "demo_user_01", + "email": "demo@demo.de", + "notification_type": "inbox", + } + ) + self.model_id = self.env["ir.model"]._get("res.partner").id + self.activity_type = self.env["mail.activity.type"].create( + { + "name": "Initial Contact", + "days": 5, + "summary": "ACT 1 : Presentation, barbecue, ... ", + "res_model_id": self.model_id, + } + ) def test_activity_creator(self): - activity = self.env['mail.activity'].sudo(self.user_01.id).create({ - 'activity_type_id': self.activity_type.id, - 'note': 'Partner activity 3.', - 'res_id': self.partner.id, - 'res_model_id': self.model_id, - 'user_id': self.user_01.id - }) + activity = ( + self.env["mail.activity"] + .sudo(self.user_01.id) + .create( + { + "activity_type_id": self.activity_type.id, + "note": "Partner activity 3.", + "res_id": self.partner.id, + "res_model_id": self.model_id, + "user_id": self.user_01.id, + } + ) + ) self.assertEqual(activity.creator_uid, self.user_01) self.assertEqual(activity.create_uid.id, SUPERUSER_ID) diff --git a/mail_activity_creator/views/mail_activity_views.xml b/mail_activity_creator/views/mail_activity_views.xml index 9c93a64..ca93c53 100644 --- a/mail_activity_creator/views/mail_activity_views.xml +++ b/mail_activity_creator/views/mail_activity_views.xml @@ -1,12 +1,12 @@ - + mail.activity.form.activity mail.activity - + - +