Skip to content

Commit 2c1721b

Browse files
committed
⬆️1️⃣2️⃣: mail_to: return back broken features
1 parent f823fa2 commit 2c1721b

File tree

3 files changed

+22
-9
lines changed

3 files changed

+22
-9
lines changed

mail_to/models/mail_message.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,18 @@
66
class MailMessage(models.Model):
77
_inherit = 'mail.message'
88

9+
# взято с mail_base
10+
@api.multi
11+
def write(self, values):
12+
if values.get('needaction_partner_ids'):
13+
if not values.get('partner_ids'):
14+
values['partner_ids'] = []
15+
for triplet in values.get('needaction_partner_ids'):
16+
if triplet[0] == 6:
17+
for i in triplet[2]:
18+
values['partner_ids'].append((4, i, False))
19+
return super(MailMessage, self).write(values)
20+
921
@api.multi
1022
def message_format(self):
1123
messages_values = super(MailMessage, self).message_format()

mail_to/static/src/js/mail_to.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
odoo.define('mail_to.MailTo', function (require) {
77
"use strict";
88

9-
var chat_manager = require('mail_base.base').chat_manager;
9+
var MailManager = require("mail.Manager");
10+
MailManager.include({
11+
_makeMessage: function(data) {
12+
var msg = this._super(data);
1013

11-
var make_message_super = chat_manager.make_message;
12-
chat_manager.make_message = function (data) {
13-
var msg = make_message_super.call(this, data);
1414
msg.partner_ids = data.partner_ids;
1515
msg.channel_names = data.channel_names;
1616
msg.recipients = data.partner_ids.concat(data.channel_names);
@@ -34,7 +34,8 @@ chat_manager.make_message = function (data) {
3434

3535
msg.more_recipients = more_recipients;
3636
return msg;
37-
};
37+
}
38+
});
3839

39-
return chat_manager;
40+
return MailManager;
4041
});

mail_to/static/src/xml/recipient.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
License LGPL-3.0 (https://www.gnu.org/licenses/lgpl.html).-->
66
<template>
77
<t t-extend="mail.widget.Thread.Message">
8-
<t t-jquery="p[class=o_mail_info] span:last" t-operation="after">
8+
<t t-jquery="p.o_mail_info span:last" t-operation="after">
99
<span class="recipients_info"><t t-if="message.partner_ids">
1010
<t t-if="message.partner_ids.length > 0">To: </t>
1111
<t t-else="message.channel_ids.length > 0">To: </t>
@@ -15,9 +15,9 @@
1515
<i t-esc="message.partner_ids[i][1]"/><t t-if="i &lt; message.partner_ids.length - 1">; </t><t t-else="message.channel_ids.length > 0 and message.partner_ids.length &lt; 4">; </t>
1616
</a>
1717
</t>
18-
<t t-if="partner_ids.length &gt; 4">
18+
<t t-if="message.partner_ids.length &gt; 4">
1919
<span t-att-title="more_recipients">
20-
and <t t-esc="partner_ids.length - 4"/> more
20+
and <t t-esc="message.partner_ids.length - 4"/> more
2121
</span>
2222
</t>
2323

0 commit comments

Comments
 (0)