Techsystech
/
social
mirror of https://github.com/OCA/social.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MIG] mail_restrict_follower_selection: Migration to 16.0

pull/1037/head
Aungkokolin1997 2023-01-11 11:33:08 +06:30 committed by Aungkokolin1997
parent 1046d7bbf3
commit fce21406c7
7 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mail_restrict_follower_selection/README.rst
View File

@ -14,13 +14,13 @@ Restrict follower selection
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
:alt: License: AGPL-3
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fsocial-lightgray.png?logo=github
:target: https://github.com/OCA/social/tree/15.0/mail_restrict_follower_selection
:target: https://github.com/OCA/social/tree/16.0/mail_restrict_follower_selection
:alt: OCA/social
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
:target: https://translation.odoo-community.org/projects/social-15-0/social-15-0-mail_restrict_follower_selection
:target: https://translation.odoo-community.org/projects/social-16-0/social-16-0-mail_restrict_follower_selection
:alt: Translate me on Weblate
.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
:target: https://runbot.odoo-community.org/runbot/205/15.0
:target: https://runbot.odoo-community.org/runbot/205/16.0
:alt: Try me on Runbot
|badge1| |badge2| |badge3| |badge4| |badge5|
@ -59,7 +59,7 @@ Bug Tracker
Bugs are tracked on `GitHub Issues <https://github.com/OCA/social/issues>`_.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us smashing it by providing a detailed and welcomed
`feedback <https://github.com/OCA/social/issues/new?body=module:%20mail_restrict_follower_selection%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
`feedback <https://github.com/OCA/social/issues/new?body=module:%20mail_restrict_follower_selection%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
Do not contact contributors directly about support or help with technical issues.
@ -92,6 +92,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and
promote its widespread use.
This module is part of the `OCA/social <https://github.com/OCA/social/tree/15.0/mail_restrict_follower_selection>`_ project on GitHub.
This module is part of the `OCA/social <https://github.com/OCA/social/tree/16.0/mail_restrict_follower_selection>`_ project on GitHub.
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

2
mail_restrict_follower_selection/__manifest__.py
View File

@ -4,7 +4,7 @@
{
"name": "Restrict follower selection",
"version": "15.0.1.0.0",
"version": "16.0.1.0.0",
"author": "Therp BV,Creu Blanca,Odoo Community Association (OCA)",
"license": "AGPL-3",
"category": "Social Network",

5
mail_restrict_follower_selection/models/mail_followers.py
View File

@ -3,7 +3,6 @@
from odoo import models
from odoo.tools import config
from odoo.tools.safe_eval import safe_eval
class MailFollowers(models.Model):
@ -33,9 +32,7 @@ class MailFollowers(models.Model):
domain = self.env[
"mail.wizard.invite"
]._mail_restrict_follower_selection_get_domain(res_model=res_model)
partners = self.env["res.partner"].search(
[("id", "in", partner_ids)] + safe_eval(domain)
)
partners = self.env["res.partner"].search([("id", "in", partner_ids)] + domain)
_res_ids = res_ids.copy() or [0]
new, update = super()._add_followers(
res_model,

14
mail_restrict_follower_selection/models/mail_thread.py
View File

@ -1,16 +1,15 @@
from odoo import models
from odoo.tools import config
from odoo.tools.safe_eval import safe_eval
class MailThread(models.AbstractModel):
_inherit = "mail.thread"
def _message_add_suggested_recipient(
self, result, partner=None, email=None, reason=""
self, result, partner=None, email=None, lang=None, reason=""
):
result = super()._message_add_suggested_recipient(
result, partner=partner, email=email, reason=reason
result, partner=partner, email=email, lang=lang, reason=reason
)
test_condition = config["test_enable"] and not self.env.context.get(
"test_restrict_follower"
@ -20,13 +19,12 @@ class MailThread(models.AbstractModel):
domain = self.env[
"mail.wizard.invite"
]._mail_restrict_follower_selection_get_domain()
eval_domain = safe_eval(domain)
for key in result:
for partner_id, email, reason in result[key]:
for partner_id, email, lang, reason in result[key]:
if partner_id:
partner = self.env["res.partner"].search(
[("id", "=", partner_id)] + eval_domain
partner = self.env["res.partner"].search_count(
[("id", "=", partner_id)] + domain
)
if not partner:
result[key].remove((partner_id, email, reason))
result[key].remove((partner_id, email, lang, reason))
return result

21
mail_restrict_follower_selection/models/mail_wizard_invite.py
View File

@ -2,9 +2,12 @@
# Copyright (C) 2017 Komit <http://www.komit-consulting.com>
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
from lxml import etree
from odoo import api, models
from odoo.osv import expression
from odoo.tools.safe_eval import safe_eval
class MailWizardInvite(models.TransientModel):
@ -15,7 +18,7 @@ class MailWizardInvite(models.TransientModel):
if not res_model:
res_model = self.env.context.get("default_res_model")
parameter_name = "mail_restrict_follower_selection.domain"
return (
parameter_domain = (
self.env["ir.config_parameter"]
.sudo()
.get_param(
@ -25,16 +28,20 @@ class MailWizardInvite(models.TransientModel):
.get_param(parameter_name, default="[]"),
)
)
domain = expression.AND(
[safe_eval(parameter_domain), self._fields["partner_ids"].domain]
)
return domain
@api.model
def fields_view_get(
self, view_id=None, view_type="form", toolbar=False, submenu=False
):
result = super(MailWizardInvite, self).fields_view_get(
view_id=view_id, view_type=view_type, toolbar=toolbar, submenu=submenu
def get_view(self, view_id=None, view_type="form", **options):
result = super(MailWizardInvite, self).get_view(
view_id=view_id, view_type=view_type, **options
)
arch = etree.fromstring(result["arch"])
for field in arch.xpath('//field[@name="partner_ids"]'):
field.attrib["domain"] = self._mail_restrict_follower_selection_get_domain()
field.attrib["domain"] = str(
self._mail_restrict_follower_selection_get_domain()
)
result["arch"] = etree.tostring(arch)
return result

6
mail_restrict_follower_selection/static/description/index.html
View File

@ -367,7 +367,7 @@ ul.auto-toc {
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/social/tree/15.0/mail_restrict_follower_selection"><img alt="OCA/social" src="https://img.shields.io/badge/github-OCA%2Fsocial-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/social-15-0/social-15-0-mail_restrict_follower_selection"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/205/15.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/social/tree/16.0/mail_restrict_follower_selection"><img alt="OCA/social" src="https://img.shields.io/badge/github-OCA%2Fsocial-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/social-16-0/social-16-0-mail_restrict_follower_selection"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/205/16.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
<p>This module was written to allow you to restrict the selection of possible
followers. For example, if you use the social ERP functions only internally,
it makes sense to filter possible followers for being employees. Otherwise,
@ -404,7 +404,7 @@ the default.</p>
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/social/issues">GitHub Issues</a>.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us smashing it by providing a detailed and welcomed
<a class="reference external" href="https://github.com/OCA/social/issues/new?body=module:%20mail_restrict_follower_selection%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
<a class="reference external" href="https://github.com/OCA/social/issues/new?body=module:%20mail_restrict_follower_selection%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
<p>Do not contact contributors directly about support or help with technical issues.</p>
</div>
<div class="section" id="credits">
@ -431,7 +431,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and
promote its widespread use.</p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/social/tree/15.0/mail_restrict_follower_selection">OCA/social</a> project on GitHub.</p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/social/tree/16.0/mail_restrict_follower_selection">OCA/social</a> project on GitHub.</p>
<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
</div>
</div>

2
mail_restrict_follower_selection/tests/test_mail_restrict_follower_selection.py
View File

@ -23,7 +23,7 @@ class TestMailRestrictFollowerSelection(TransactionCase):
)
def test_fields_view_get(self):
result = self.env["mail.wizard.invite"].fields_view_get(view_type="form")
result = self.env["mail.wizard.invite"].get_view(view_type="form")
for field in etree.fromstring(result["arch"]).xpath(
'//field[@name="partner_ids"]'
):