Browse Source

🌈 pre-commit

pull/324/head
Denis Mudarisov 4 years ago
parent
commit
85e5070064
No known key found for this signature in database GPG Key ID: B9AD74DAFB7B53DA
  1. 2
      mail_to/doc/changelog.rst
  2. 1
      mail_to/static/src/js/mail_to.js
  3. 16
      mail_to/static/src/xml/recipient.xml

2
mail_to/doc/changelog.rst

@ -1,7 +1,7 @@
`1.1.2` `1.1.2`
------- -------
- **Fix** if open the pop-up chat window and reload the page, then an error might occur randomly
- **Fix:** if open the pop-up chat window and reload the page, then an error might occur randomly
`1.1.1` `1.1.1`
------- -------

1
mail_to/static/src/js/mail_to.js

@ -10,7 +10,6 @@ odoo.define("mail_to.MailTo", function(require) {
var chat_manager = require("mail_base.base").chat_manager; var chat_manager = require("mail_base.base").chat_manager;
chat_manager.is_ready = chat_manager.is_ready.then(function () { chat_manager.is_ready = chat_manager.is_ready.then(function () {
var make_message_super = chat_manager.make_message; var make_message_super = chat_manager.make_message;
chat_manager.make_message = function (data) { chat_manager.make_message = function (data) {
var msg = make_message_super.call(this, data); var msg = make_message_super.call(this, data);

16
mail_to/static/src/xml/recipient.xml

@ -20,7 +20,9 @@
<t t-if="i &lt; message.partner_ids.length - 1">;</t> <t t-if="i &lt; message.partner_ids.length - 1">;</t>
<t <t
t-else="message.channel_ids.length > 0 and message.partner_ids.length &lt; 4" t-else="message.channel_ids.length > 0 and message.partner_ids.length &lt; 4"
>; </t>
>
;
</t>
</a> </a>
</t> </t>
</t> </t>
@ -35,9 +37,9 @@
class="recipient_link" class="recipient_link"
> >
<i t-esc="message.channel_names[i][1]" /> <i t-esc="message.channel_names[i][1]" />
<t
t-if="i &lt; message.channel_ids.length - 1"
>; </t>
<t t-if="i &lt; message.channel_ids.length - 1">
;
</t>
</a> </a>
</t> </t>
</t> </t>
@ -46,9 +48,11 @@
t-if="message.recipients.length &gt; message.more_recipients_value" t-if="message.recipients.length &gt; message.more_recipients_value"
> >
<span t-att-title="message.more_recipients"> <span t-att-title="message.more_recipients">
and <t
and
<t
t-esc="message.recipients.length - message.more_recipients_value" t-esc="message.recipients.length - message.more_recipients_value"
/> more
/>
more
</span> </span>
</t> </t>
</t> </t>

Loading…
Cancel
Save