Purpose ======= This commit improves the UI of the mail group module (backend and portal view), fix some bugs and clean the code. Bug 1 ===== If a user click 2 times on a confirmation link, an error is raised. Bug 2 ===== A bug about the website snippets has been fixed; - Add the snippet to a group in which you are member - Change the group of the snippet to a group in which you are not member - The snippet still show "Unsubscribe" Bug 3 ===== In the portal view, when messages are filtered by month, messages which are created in the last day of the month appear also in the next month. Specification ============= UI -- Show the Allow / Ban buttons whatever is the state of the message, so the user can ban / whitelist a message even if there's no pending email. When we receive an email, remove the "Mailing List" footer. This was a big issue because when some users reply many times, the footer was duplicated on each answer. Improve the form view of the mail group: - On non-moderated group, show all messages instead of only pending message - Show the guidelines stuff on non-moderated groups Improve the portal view - show the attachments under every message (not only on opened message) - improve the template to confirm the subscription of the user - improve the portal view for mobile device - do not show rejected messages, even for admin - do not show the button "X replies" when the mode is not thread Technical --------- Split the route "/groups/subscription" into "/group/subscribe" and "/group/unsubscribe" Correctly quote the parent email for the emails sent by web version of Outlook (with the HTML id "divRplyFwdMsg"). ACLs ---- Now only administrators or responsible / moderators can write / unlink the group. Fix an ACL issue on the group member where the responsible of a non-moderated group could not access the members of the group. Members with same email ----------------------- Improve the behavior when multiple members have the same email address (this situation is possible because there's no unique constraint on the email field of the <res.partner> model.) We now return the most appropriate member for the given email address and partner. When unsubscribing by clicking on the confirmation link that we received by email, remove all members with the same email address. Links ===== Task-2599676 See odoo/odoo/pull/73640 closes odoo/odoo#73640 Related: odoo/upgrade#2774 Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
206 lines
10 KiB
Python
206 lines
10 KiB
Python
# -*- coding: utf-8 -*-
|
|
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
|
|
|
from odoo.addons.mail.tests.common import mail_new_test_user
|
|
from odoo.addons.mail_group.tests.common import TestMailListCommon
|
|
from odoo.exceptions import ValidationError, AccessError
|
|
from odoo.tests.common import users
|
|
from odoo.tools import mute_logger, append_content_to_html
|
|
|
|
|
|
class TestMailGroup(TestMailListCommon):
|
|
def test_clean_email_body(self):
|
|
template = self.env.ref('mail_group.mail_group_footer')
|
|
footer = template._render({'group_url': 'Test remove footer'}, engine='ir.qweb', minimal_qcontext=True)
|
|
body = append_content_to_html("<div>Test email body</div>", footer, plaintext=False)
|
|
|
|
result = self.env['mail.group']._clean_email_body(body)
|
|
self.assertIn('Test email body', result, 'Should have kept the original email body')
|
|
self.assertNotIn('Test remove footer', result, 'Should have removed the mailing list footer')
|
|
self.assertNotIn('o_mg_message_footer', result, 'Should have removed the entire HTML element')
|
|
|
|
def test_constraint_valid_email(self):
|
|
mail_group = self.env['mail.group'].with_user(self.user_employee).browse(self.test_group.ids)
|
|
user_without_email = mail_new_test_user(
|
|
self.env, login='user_employee_nomail',
|
|
company_id=self.company_admin.id,
|
|
email=False,
|
|
groups='base.group_user',
|
|
name='User without email',
|
|
)
|
|
|
|
with self.assertRaises(ValidationError, msg="Moderators must have an email"):
|
|
mail_group.moderator_ids |= user_without_email
|
|
|
|
def test_find_member(self):
|
|
"""Test the priority to retrieve a member of a mail group from a partner_id
|
|
and an email address.
|
|
|
|
When a partner is given for the search, return in priority
|
|
- The member whose partner match the given partner
|
|
- The member without partner but whose email match the given email
|
|
|
|
When no partner is given for the search, return in priority
|
|
- A member whose email match the given email and has no partner
|
|
- A member whose email match the given email and has partner
|
|
"""
|
|
member_1 = self.test_group_member_1
|
|
email = member_1.email_normalized
|
|
|
|
partner_2 = self.user_portal.partner_id
|
|
partner_2.email = '"Bob" <%s>' % email
|
|
member_2 = self.env['mail.group.member'].create({
|
|
'partner_id': partner_2.id,
|
|
'mail_group_id': self.test_group.id,
|
|
})
|
|
|
|
partner_3 = self.partner_root
|
|
partner_3.email = '"Bob" <%s>' % email
|
|
member_3 = self.env['mail.group.member'].create({
|
|
'partner_id': partner_3.id,
|
|
'mail_group_id': self.test_group.id,
|
|
})
|
|
|
|
member = self.test_group._find_member(email)
|
|
self.assertEqual(member, member_1, 'When no partner is provided, return the member without partner in priority')
|
|
|
|
member = self.test_group._find_member(email, partner_2.id)
|
|
self.assertEqual(member, member_2, 'Should return the member with the right partner')
|
|
|
|
member = self.test_group._find_member(email, partner_3.id)
|
|
self.assertEqual(member, member_3, 'Should return the member with the right partner')
|
|
|
|
member_2.unlink()
|
|
member = self.test_group._find_member(email, partner_2.id)
|
|
self.assertEqual(member, member_1, 'Should return the member without partner')
|
|
|
|
member_1.unlink()
|
|
member = self.test_group._find_member(email, partner_2.id)
|
|
self.assertFalse(member, 'Should not return any member because the only one with the same email has a different partner')
|
|
|
|
@users('employee')
|
|
def test_join_group(self):
|
|
mail_group = self.env['mail.group'].browse(self.test_group.ids)
|
|
self.assertEqual(len(mail_group.member_ids), 4)
|
|
|
|
mail_group._join_group('"Jack" <jack@test.com>')
|
|
self.assertEqual(len(mail_group.member_ids), 5)
|
|
self.assertTrue(mail_group._find_member('"Test" <jack@test.com>'))
|
|
|
|
mail_group._join_group('"Jack the developer" <jack@test.com>')
|
|
self.assertEqual(len(mail_group.member_ids), 5, 'Should not have added the duplicated email')
|
|
|
|
# Join a group with a different email than the partner
|
|
portal_partner = self.user_portal.partner_id
|
|
mail_group._join_group('"Bob" <email_different_than_partner@test.com>', portal_partner.id)
|
|
self.assertEqual(len(mail_group.member_ids), 6, 'Should have added the new member')
|
|
member = mail_group._find_member('email_different_than_partner@test.com', portal_partner.id)
|
|
self.assertTrue(member)
|
|
self.assertEqual(member.partner_id, portal_partner, 'Should have set the partner')
|
|
self.assertEqual(member.email, portal_partner.email, 'Should have force the email to the email of the partner')
|
|
self.assertEqual(member.email_normalized, portal_partner.email_normalized)
|
|
|
|
portal_partner.email = 'new_portal_email@example.com'
|
|
self.assertEqual(member.email, 'new_portal_email@example.com', 'Should have change the email of the partner')
|
|
self.assertEqual(member.email_normalized, 'new_portal_email@example.com')
|
|
|
|
@mute_logger('odoo.addons.base.models.ir_rule', 'odoo.addons.base.models.ir_model')
|
|
@users('employee')
|
|
def test_mail_group_access_mode_groups(self):
|
|
test_group = self.env.ref('base.group_partner_manager')
|
|
mail_group = self.env['mail.group'].browse(self.test_group.ids)
|
|
mail_group.write({
|
|
'access_group_id': test_group.id,
|
|
'access_mode': 'groups',
|
|
})
|
|
|
|
with self.assertRaises(AccessError):
|
|
mail_group.with_user(self.user_portal).check_access_rule('read')
|
|
|
|
public_user = self.env.ref('base.public_user')
|
|
with self.assertRaises(AccessError):
|
|
mail_group.with_user(public_user).check_access_rule('read')
|
|
|
|
with self.assertRaises(AccessError):
|
|
mail_group.with_user(self.user_employee_2).check_access_rule('read')
|
|
|
|
# Add the group to the user
|
|
self.user_employee_2.groups_id |= test_group
|
|
mail_group.with_user(self.user_employee_2).check_access_rule('read')
|
|
with self.assertRaises(AccessError, msg='Only moderator / responsible and admin can write on the group'):
|
|
mail_group.with_user(self.user_employee_2).check_access_rule('write')
|
|
|
|
# Remove the group of the user BUT add it in the moderators list
|
|
self.user_employee_2.groups_id -= test_group
|
|
mail_group.moderator_ids |= self.user_employee_2
|
|
mail_group.with_user(self.user_employee_2).check_access_rule('read')
|
|
mail_group.with_user(self.user_employee_2).check_access_rule('write')
|
|
|
|
# Test with public user
|
|
mail_group.access_group_id = self.env.ref('base.group_public')
|
|
mail_group.with_user(public_user).check_access_rule('read')
|
|
mail_group.with_user(public_user).check_access_rights('read')
|
|
with self.assertRaises(AccessError):
|
|
mail_group.with_user(public_user).check_access_rule('write')
|
|
mail_group.with_user(public_user).check_access_rights('write')
|
|
|
|
@mute_logger('odoo.addons.base.models.ir_rule', 'odoo.addons.base.models.ir_model')
|
|
@users('employee')
|
|
def test_mail_group_access_mode_public(self):
|
|
mail_group = self.env['mail.group'].browse(self.test_group.ids)
|
|
mail_group.access_mode = 'public'
|
|
|
|
public_user = self.env.ref('base.public_user')
|
|
mail_group.with_user(public_user).check_access_rule('read')
|
|
with self.assertRaises(AccessError):
|
|
mail_group.with_user(public_user).check_access_rights('write')
|
|
|
|
mail_group.with_user(self.user_employee_2).check_access_rule('read')
|
|
with self.assertRaises(AccessError, msg='Only moderator / responsible and admin can write on the group'):
|
|
mail_group.with_user(self.user_employee_2).check_access_rule('write')
|
|
|
|
mail_group.moderator_ids |= self.user_employee_2
|
|
mail_group.with_user(self.user_employee_2).check_access_rule('write')
|
|
|
|
@mute_logger('odoo.addons.base.models.ir_rule', 'odoo.addons.base.models.ir_model')
|
|
@users('employee')
|
|
def test_mail_group_access_mode_members(self):
|
|
mail_group = self.env['mail.group'].browse(self.test_group.ids)
|
|
mail_group.access_mode = 'members'
|
|
partner = self.user_employee_2.partner_id
|
|
self.assertNotIn(partner, mail_group.member_partner_ids)
|
|
|
|
with self.assertRaises(AccessError, msg='Non-member should not have access to the group'):
|
|
mail_group.with_user(self.user_employee_2).check_access_rule('read')
|
|
|
|
public_user = self.env.ref('base.public_user')
|
|
with self.assertRaises(AccessError, msg='Non-member should not have access to the group'):
|
|
mail_group.with_user(public_user).check_access_rule('read')
|
|
|
|
mail_group.write({'member_ids': [(0, 0, {
|
|
'partner_id': partner.id,
|
|
})]})
|
|
self.assertIn(partner, mail_group.member_partner_ids)
|
|
|
|
# Now that portal is in the member list he should have access
|
|
mail_group.with_user(self.user_employee_2).check_access_rule('read')
|
|
with self.assertRaises(AccessError, msg='Only moderator / responsible and admin can write on the group'):
|
|
mail_group.with_user(self.user_employee_2).check_access_rule('write')
|
|
|
|
mail_group.moderator_ids |= self.user_employee_2
|
|
mail_group.with_user(self.user_employee_2).check_access_rule('write')
|
|
|
|
@mute_logger('odoo.addons.base.models.ir_rule', 'odoo.addons.base.models.ir_model')
|
|
@users('employee')
|
|
def test_mail_group_member_security(self):
|
|
member = self.env['mail.group.member'].browse(self.test_group_member_1.ids)
|
|
self.assertEqual(member.email, '"Member 1" <member_1@test.com>', msg='Moderators should have access to members')
|
|
|
|
with self.assertRaises(AccessError, msg='Portal should not have access to members'):
|
|
member.with_user(self.user_portal).check_access_rule('read')
|
|
member.with_user(self.user_portal).check_access_rights('read')
|
|
|
|
with self.assertRaises(AccessError, msg='Non moderators should not have access to member'):
|
|
member.with_user(self.user_portal).check_access_rule('read')
|
|
member.with_user(self.user_portal).check_access_rights('read')
|