diff options
| author | Tiffany Chang (tic) <tic@odoo.com> | 2020-02-13 12:59:34 +0000 |
|---|---|---|
| committer | Tiffany Chang (tic) <tic@odoo.com> | 2020-03-26 10:15:18 +0000 |
| commit | f9ff21a200b0c5553ba6d1314e4d9f54d3ebdd7d (patch) | |
| tree | af7ff5f3eb86d2a0ee79a23aac6397d75820f524 /addons/phone_validation/models/mail_thread_phone.py | |
| parent | 3a112c7b78d04479e7f8d27adaeb0753bdb0111c (diff) | |
[IMP] mass_mailing_(sms): Add unblacklisting button
Previously a blacklisted phone number or email address could only be
removed from their respective blacklist by going to the corresponding
blacklist view [in mass_mailing_(sms)] and manually
archiving/deactiviting the entry. All users could see that an email was
blacklisted via an fa-ban icon added next to their corresponding field
in the modules: crm, mass_mailing, mass_mailing_sms, and contacts (via
extension).
This commit adds additional fa-ban icons next to blacklisted phone
numbers and makes all instances of these icons clickable to remove them
from their corresponding blacklist using a wizard. There are several
limitations to this implementation including:
1. If both a mobile and phone number field appear within a crm lead
instance, then only the mobile field will indicate if it is blacklisted
(due to current implementation of PhoneMixin which only checks 1 phone
value against the blacklist and "sms" which returns mobile numbers first).
I.e. if a phone field value is blacklisted, but a value is typed into the
mobile field, then the phone field will never indicate that it is blacklisted.
2. If someone clicks on a unblacklisting icon after changing the
corresponding field value without clicking off the field input, then the
latest typed in value will be the one submitted for unblacklisting,
which may not actually be blacklisted (due to "is_blacklisted" flag
being a computed field and it not having a chance to re-compute to hide
the button).
3. If someone changes values in the blacklist, then someone who already
has a form open will not see icon disappear until something triggers a
re-compute of the "phone_sanitized_blacklisted" flag (this was already the
case with the icon, but now a user may try to unblacklist a value that is
already unblacklisted.)
4. Since the icon needs to be visible by everyone to indicate whether or
not a phone/email is blacklisted, users without corresponding unblacklist
permissions will be able to click on the icon. When they click on it, they
will be informed they do not have permission to unblacklist. A wizard was
determined to be the best way to implement this unblacklisting for the
following reasons:
- A "Unblacklisting Reason" is needed and will not be stored as a field.
- A field widget is unable to do this due to security settings +
inability to refresh view after unblacklisting with a
"Unblacklisting Reason" without wiping unsaved changes.
Additionally, to better align with GDPR, the corresponding form view for
the phone/email blacklist has been updated to use the same wizard to
track "Reason for unblacklisting". Unfortunately there is no
straightforward way to prevent direct "Archive" action, so users are
still able to bypass unblacklisting without being asked for a "reason
for unblacklisting".
Supports task: 2117635
Upgrade PR: odoo/upgrade#939
COM PR: odoo/odoo#45315
Diffstat (limited to 'addons/phone_validation/models/mail_thread_phone.py')
| -rw-r--r-- | addons/phone_validation/models/mail_thread_phone.py | 47 |
1 files changed, 40 insertions, 7 deletions
diff --git a/addons/phone_validation/models/mail_thread_phone.py b/addons/phone_validation/models/mail_thread_phone.py index d0e9b5b9254..9b608c8b601 100644 --- a/addons/phone_validation/models/mail_thread_phone.py +++ b/addons/phone_validation/models/mail_thread_phone.py @@ -3,7 +3,7 @@ from odoo import api, fields, models, _ from odoo.addons.phone_validation.tools import phone_validation -from odoo.exceptions import UserError +from odoo.exceptions import AccessError, UserError class PhoneMixin(models.AbstractModel): @@ -30,10 +30,18 @@ class PhoneMixin(models.AbstractModel): phone_sanitized = fields.Char( string='Sanitized Number', compute="_compute_phone_sanitized", compute_sudo=True, store=True, help="Field used to store sanitized phone number. Helps speeding up searches and comparisons.") + phone_sanitized_blacklisted = fields.Boolean( + string='Phone Blacklisted', compute="_compute_blacklisted", compute_sudo=True, store=False, + search="_search_phone_sanitized_blacklisted", groups="base.group_user", + help="If the sanitized phone number is on the blacklist, the contact won't receive mass mailing sms anymore, from any list") phone_blacklisted = fields.Boolean( - string='Phone Blacklisted', compute="_compute_phone_blacklisted", compute_sudo=True, store=False, - search="_search_phone_blacklisted", groups="base.group_user", - help="If the phone number is on the blacklist, the contact won't receive mass mailing sms anymore, from any list") + string='Blacklisted Phone is Phone', compute="_compute_blacklisted", compute_sudo=True, store=False, groups="base.group_user", + help="Indicates if a blacklisted sanitized phone number is a phone number. Helps distinguish which number is blacklisted \ + when there is both a mobile and phone field in a model.") + mobile_blacklisted = fields.Boolean( + string='Blacklisted Phone Is Mobile', compute="_compute_blacklisted", compute_sudo=True, store=False, groups="base.group_user", + help="Indicates if a blacklisted sanitized phone number is a mobile number. Helps distinguish which number is blacklisted \ + when there is both a mobile and phone field in a model.") @api.depends(lambda self: self._phone_get_number_fields()) def _compute_phone_sanitized(self): @@ -47,16 +55,26 @@ class PhoneMixin(models.AbstractModel): record.phone_sanitized = sanitized @api.depends('phone_sanitized') - def _compute_phone_blacklisted(self): + def _compute_blacklisted(self): # TODO : Should remove the sudo as compute_sudo defined on methods. # But if user doesn't have access to mail.blacklist, doen't work without sudo(). blacklist = set(self.env['phone.blacklist'].sudo().search([ ('number', 'in', self.mapped('phone_sanitized'))]).mapped('number')) + number_fields = self._phone_get_number_fields() for record in self: - record.phone_blacklisted = record.phone_sanitized in blacklist + record.phone_sanitized_blacklisted = record.phone_sanitized in blacklist + # This is a bit of a hack. Assume that any "mobile" numbers will have the word 'mobile' + # in them due to varying field names and assume all others are just "phone" numbers. + # Note that the limitation of only having 1 phone_sanitized value means that a phone/mobile number + # may not be calculated as blacklisted even though it is if both field values exist in a model. + for number_field in number_fields: + if 'mobile' in number_field: + record.mobile_blacklisted = record.phone_sanitized_blacklisted and record.phone_get_sanitized_number(number_fname=number_field) == record.phone_sanitized + else: + record.phone_blacklisted = record.phone_sanitized_blacklisted and record.phone_get_sanitized_number(number_fname=number_field) == record.phone_sanitized @api.model - def _search_phone_blacklisted(self, operator, value): + def _search_phone_sanitized_blacklisted(self, operator, value): # Assumes operator is '=' or '!=' and value is True or False self._assert_phone_field() if operator != '=': @@ -121,3 +139,18 @@ class PhoneMixin(models.AbstractModel): def _phone_reset_blacklisted(self): return self.env['phone.blacklist'].sudo()._remove([r.phone_sanitized for r in self]) + + def phone_action_blacklist_remove(self): + # wizard access rights currently not working as expected and allows users without access to + # open this wizard, therefore we check to make sure they have access before the wizard opens. + can_access = self.env['phone.blacklist'].check_access_rights('write', raise_exception=False) + if can_access: + return { + 'name': 'Are you sure you want to unblacklist this Phone Number?', + 'type': 'ir.actions.act_window', + 'view_mode': 'form', + 'res_model': 'phone.blacklist.remove', + 'target': 'new', + } + else: + raise AccessError("You do not have the access right to unblacklist phone numbers. Please contact your administrator.") |
