diff --git a/mail_sent/__manifest__.py b/mail_sent/__manifest__.py index f8e9ee7..63ce6c8 100644 --- a/mail_sent/__manifest__.py +++ b/mail_sent/__manifest__.py @@ -1,9 +1,11 @@ +# Copyright 2020 Denis Mudarisov +# License MIT (https://opensource.org/licenses/MIT). { "name": "Sentbox", "summary": """Quick way to find sent messages""", "category": "Discuss", "images": ["images/menu.png"], - "version": "11.0.1.1.0", + "version": "11.0.1.1.1", "author": "IT-Projects LLC, Ivan Yelizariev, Pavel Romanchenko", "support": "apps@itpp.dev", "website": "https://it-projects.info", diff --git a/mail_sent/doc/changelog.rst b/mail_sent/doc/changelog.rst index e2ba0ac..34a1843 100644 --- a/mail_sent/doc/changelog.rst +++ b/mail_sent/doc/changelog.rst @@ -1,3 +1,8 @@ +`1.1.1` +------- + +- **Fix:** adaptation to changes in `mail_base` + `1.1.0` ------- diff --git a/mail_sent/static/src/js/sent.js b/mail_sent/static/src/js/sent.js index 6a88ca7..99e605d 100644 --- a/mail_sent/static/src/js/sent.js +++ b/mail_sent/static/src/js/sent.js @@ -1,4 +1,6 @@ -odoo.define("mail_sent.sent", function(require) { +/* Copyright 2020 Denis Mudarisov + License MIT (https://opensource.org/licenses/MIT). */ +odoo.define("mail_sent.sent", function (require) { "use strict"; var core = require("web.core"); @@ -9,7 +11,7 @@ odoo.define("mail_sent.sent", function(require) { var ChatAction = core.action_registry.get("mail.chat.instant_messaging"); ChatAction.include({ - init: function(parent, action, options) { + init: function (parent, action, options) { this._super.apply(this, arguments); var channel_name = "channel_sent"; // Add channel Sent for show "Send message" button @@ -18,44 +20,44 @@ odoo.define("mail_sent.sent", function(require) { this.channels_display_subject.push(channel_name); }, - update_message_on_current_channel: function(current_channel_id, message) { + update_message_on_current_channel: function (current_channel_id, message) { var result = this._super.apply(this, arguments); var sent = current_channel_id === "channel_sent" && !message.is_sent; return sent || result; }, }); - // Inherit class and override methods - var chat_manager_super = _.clone(chat_manager); - chat_manager.get_properties = function(msg) { - var properties = chat_manager_super.get_properties.apply(this, arguments); - properties.is_sent = this.property_descr("channel_sent", msg, this); - return properties; - }; + chat_manager.is_ready.then(function () { + // Inherit class and override methods + var chat_manager_super = _.clone(chat_manager); + chat_manager.get_properties = function (msg) { + var properties = chat_manager_super.get_properties.apply(this, arguments); + properties.is_sent = this.property_descr("channel_sent", msg, this); + return properties; + }; - chat_manager.set_channel_flags = function(data, msg) { - chat_manager_super.set_channel_flags.apply(this, arguments); - if (data.sent && data.author_id[0] === session.partner_id) { - msg.is_sent = true; - } - return msg; - }; + chat_manager.set_channel_flags = function (data, msg) { + chat_manager_super.set_channel_flags.apply(this, arguments); + if (data.sent && data.author_id[0] === session.partner_id) { + msg.is_sent = true; + } + return msg; + }; - chat_manager.get_channel_array = function(msg) { - var arr = chat_manager_super.get_channel_array.apply(this, arguments); - return arr.concat("channel_sent"); - }; + chat_manager.get_channel_array = function (msg) { + var arr = chat_manager_super.get_channel_array.apply(this, arguments); + return arr.concat("channel_sent"); + }; - chat_manager.get_domain = function(channel) { - return channel.id === "channel_sent" - ? [ - ["sent", "=", true], - ["author_id.user_ids", "in", [session.uid]], - ] - : chat_manager_super.get_domain.apply(this, arguments); - }; + chat_manager.get_domain = function (channel) { + return channel.id === "channel_sent" + ? [ + ["sent", "=", true], + ["author_id.user_ids", "in", [session.uid]], + ] + : chat_manager_super.get_domain.apply(this, arguments); + }; - chat_manager.is_ready.then(function() { // Add sent channel chat_manager.add_channel({ id: "channel_sent", diff --git a/mail_sent/static/src/xml/menu.xml b/mail_sent/static/src/xml/menu.xml index b6b1e57..c0392d1 100644 --- a/mail_sent/static/src/xml/menu.xml +++ b/mail_sent/static/src/xml/menu.xml @@ -7,9 +7,10 @@ t-attf-class="o_mail_chat_title_main o_mail_chat_channel_item #{(active_channel_id == 'channel_sent') ? 'o_active': ''}" data-channel-id="channel_sent" > - Sent + + + Sent + @@ -18,8 +19,9 @@
No sent messages
-
You can send messages and then these messages will appear here.
+
+ You can send messages and then these messages will appear here. +