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

porting fetchmail_notify_error_to_sender to 10.0

pull/2286/head
eLBati 2017-07-13 18:05:36 +02:00 committed by Jasmin Solanki
parent d040a6142f
commit 895dbd73c3
1 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
fetchmail_notify_error_to_sender/models/mail_thread.py
View File

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Copyright 2015 Lorenzo Battistini <lorenzo.battistini@agilebg.com> # Copyright 2015-2017 Lorenzo Battistini <lorenzo.battistini@agilebg.com>
# Copyright 2017 Eficent <http://www.eficent.com> # Copyright 2017 Eficent <http://www.eficent.com>
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
@ -10,44 +10,23 @@ class MailThread(models.AbstractModel):
_inherit = 'mail.thread' _inherit = 'mail.thread'
@api.model @api.model
def message_route_verify( def message_route(self, message, message_dict, model=None, thread_id=None,
self, message, message_dict, route, update_author=True, custom_values=None):
assert_model=True, create_fallback=True, allow_private=False):
res = ()
try: try:
res = super(MailThread, self).message_route_verify( res = super(MailThread, self).message_route(
message, message_dict, route, message, message_dict, model=model, thread_id=thread_id,
update_author=update_author, assert_model=assert_model, custom_values=custom_values)
create_fallback=create_fallback, allow_private=allow_private)
except ValueError as ve: except ValueError as ve:
fetchmail_server_id = self.env.context.get('fetchmail_server_id') fetchmail_server_id = self.env.context.get('fetchmail_server_id')
if not fetchmail_server_id: if not fetchmail_server_id:
raise ve raise ve
fetchmail_server = self.pool['fetchmail.server'].browse( fetchmail_server = self.env['fetchmail.server'].with_context({
fetchmail_server_id) 'sender_message': message,
'route_exception': ve,
}).browse(fetchmail_server_id)
if not fetchmail_server.error_notice_template_id: if not fetchmail_server.error_notice_template_id:
raise ve raise ve
self.env.context['sender_message'] = message fetchmail_server.error_notice_template_id.send_mail(
self.env.context['route_exception'] = ve
self.env['mail.template'].send_mail(
fetchmail_server.error_notice_template_id.id,
fetchmail_server.id) fetchmail_server.id)
self.env.context['error_notice_sent'] = True raise ve
return res
@api.model
def message_route(
self, message, message_dict, model=None, thread_id=None,
custom_values=None):
res = []
try:
res = super(MailThread, self).message_route(
message, message_dict, model=model,
thread_id=thread_id, custom_values=custom_values)
except ValueError as ve:
if self.env.context.get('error_notice_sent'):
# avoid raising exception and setting mail message UNSEEN
return []
else:
raise ve
return res return res