From cb59cb0436bf78fa643d7c6acc4ebaddc83bbb32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 26 Oct 2018 10:14:17 +0000 Subject: [PATCH] [REF] survey: rename invitation wizard to better match its business use Purpose is to have a somehow cleaner name for this wizard as its purpose is to send invitations. Email and composer are details on how it works. This commit is linked to task ID 1909804 and PR #28783. --- addons/survey/__manifest__.py | 2 +- addons/survey/models/survey_survey.py | 2 +- addons/survey/tests/test_survey.py | 8 ++++---- addons/survey/wizard/__init__.py | 2 +- .../{survey_mail_compose_message.py => survey_invite.py} | 8 ++++---- ...compose_message_views.xml => survey_invite_views.xml} | 9 +++------ 6 files changed, 14 insertions(+), 17 deletions(-) rename addons/survey/wizard/{survey_mail_compose_message.py => survey_invite.py} (98%) rename addons/survey/wizard/{survey_mail_compose_message_views.xml => survey_invite_views.xml} (93%) diff --git a/addons/survey/__manifest__.py b/addons/survey/__manifest__.py index 2c2e45bf93d..042076f1f2e 100644 --- a/addons/survey/__manifest__.py +++ b/addons/survey/__manifest__.py @@ -31,7 +31,7 @@ sent mails with personal token for the invitation of the survey. 'views/survey_question_views.xml', 'views/survey_page_views.xml', 'views/survey_templates.xml', - 'wizard/survey_mail_compose_message_views.xml', + 'wizard/survey_invite_views.xml', ], 'demo': [ 'data/survey_demo_user.xml', diff --git a/addons/survey/models/survey_survey.py b/addons/survey/models/survey_survey.py index 65955df273e..b78f947aeef 100644 --- a/addons/survey/models/survey_survey.py +++ b/addons/survey/models/survey_survey.py @@ -302,7 +302,7 @@ class Survey(models.Model): 'type': 'ir.actions.act_window', 'view_type': 'form', 'view_mode': 'form', - 'res_model': 'survey.mail.compose.message', + 'res_model': 'survey.invite', 'target': 'new', 'context': local_context, } diff --git a/addons/survey/tests/test_survey.py b/addons/survey/tests/test_survey.py index 2b6d46b14ff..312a566e56a 100644 --- a/addons/survey/tests/test_survey.py +++ b/addons/survey/tests/test_survey.py @@ -132,7 +132,7 @@ class TestSurvey(TransactionCase): 'type': 'ir.actions.act_window', 'view_type': 'form', 'view_mode': 'form', - 'res_model': 'survey.mail.compose.message', + 'res_model': 'survey.invite', 'target': 'new', 'context': ctx, }) @@ -150,15 +150,15 @@ class TestSurvey(TransactionCase): def test_07_survey_email_message(self): # Case-1: Executing send_mail with correct data. partner = self.env['res.partner'].create({'name': 'Marie De Cock', 'email': 'marie.de.cock@gmail.com'}) - survey_mail_message = self.env['survey.mail.compose.message'].sudo(self.survey_manager).create({ + survey_mail_message = self.env['survey.invite'].sudo(self.survey_manager).create({ 'survey_id': self.survey1.id, 'public': 'email_public_link', 'body': '__URL__', 'partner_ids': [(4, partner.id)]}) survey_mail_message.send_mail() # Case-2: Executing send_mail with incorrect data. mail_messages = [ - self.env['survey.mail.compose.message'].sudo(self.survey_manager).create({ # Mail Message without __URL__ in body. + self.env['survey.invite'].sudo(self.survey_manager).create({ # Mail Message without __URL__ in body. 'survey_id': self.survey1.id, 'public': 'email_public_link'}), - self.env['survey.mail.compose.message'].sudo(self.survey_manager).create({ # Mail Message without recipents. + self.env['survey.invite'].sudo(self.survey_manager).create({ # Mail Message without recipents. 'survey_id': self.survey1.id, 'public': 'email_public_link', 'body': "__URL__"})] for message in mail_messages: self.assertRaises(UserError, message.send_mail) diff --git a/addons/survey/wizard/__init__.py b/addons/survey/wizard/__init__.py index 09c05c0941a..df860ddab0d 100644 --- a/addons/survey/wizard/__init__.py +++ b/addons/survey/wizard/__init__.py @@ -1,4 +1,4 @@ # -*- encoding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from . import survey_mail_compose_message +from . import survey_invite diff --git a/addons/survey/wizard/survey_mail_compose_message.py b/addons/survey/wizard/survey_invite.py similarity index 98% rename from addons/survey/wizard/survey_mail_compose_message.py rename to addons/survey/wizard/survey_invite.py index fbc436457a4..4f8f57276cb 100644 --- a/addons/survey/wizard/survey_mail_compose_message.py +++ b/addons/survey/wizard/survey_invite.py @@ -18,9 +18,9 @@ emails_split = re.compile(r"[;,\n\r]+") email_validator = re.compile(r"[^@]+@[^@]+\.[^@]+") -class SurveyMailComposeMessage(models.TransientModel): - _name = 'survey.mail.compose.message' - _description = 'Email composition wizard for Survey' +class SurveyInvite(models.TransientModel): + _name = 'survey.invite' + _description = 'Survey Invitation Wizard' def default_survey_id(self): context = self.env.context @@ -78,7 +78,7 @@ class SurveyMailComposeMessage(models.TransientModel): @api.model def default_get(self, fields): - res = super(SurveyMailComposeMessage, self).default_get(fields) + res = super(SurveyInvite, self).default_get(fields) context = self.env.context if context.get('active_model') == 'res.partner' and context.get('active_ids'): res.update({'partner_ids': context['active_ids']}) diff --git a/addons/survey/wizard/survey_mail_compose_message_views.xml b/addons/survey/wizard/survey_invite_views.xml similarity index 93% rename from addons/survey/wizard/survey_mail_compose_message_views.xml rename to addons/survey/wizard/survey_invite_views.xml index 515dbd4677a..942714e0f43 100644 --- a/addons/survey/wizard/survey_mail_compose_message_views.xml +++ b/addons/survey/wizard/survey_invite_views.xml @@ -1,13 +1,10 @@ - - - - - survey.mail.compose.message.form - survey.mail.compose.message + + survey.invite.view.form + survey.invite