From fff8adcb4c63ef11f5168c306f450cefb3d88bc4 Mon Sep 17 00:00:00 2001 From: Vildan Safin Date: Thu, 30 Jul 2020 16:48:55 +0500 Subject: [PATCH 1/6] Merge remote-tracking branch 'Eugene/12.0-mail_addons-merge-mail_to-fix' into 12.0-mail_to Signed-off-by: Vildan Safin --- mail_to/__init__.py | 2 ++ mail_to/__manifest__.py | 10 ++++-- mail_to/doc/changelog.rst | 6 ++++ mail_to/i18n/de.po | 5 +-- mail_to/i18n/mail_to.pot | 19 ++++++++-- mail_to/i18n/sl.po | 12 ++++--- mail_to/models/__init__.py | 1 + mail_to/models/mail_message.py | 29 +++++++++++++++ mail_to/static/src/js/mail_to.js | 42 ++++++++++++++++++++++ mail_to/static/src/js/test_mail_to.js | 20 +++++++++++ mail_to/static/src/xml/recipient.xml | 52 +++++++++++++++++---------- mail_to/templates.xml | 9 +++-- mail_to/tests/__init__.py | 1 + mail_to/tests/test_default.py | 7 ++-- 14 files changed, 180 insertions(+), 35 deletions(-) create mode 100644 mail_to/models/__init__.py create mode 100644 mail_to/models/mail_message.py create mode 100644 mail_to/static/src/js/mail_to.js create mode 100644 mail_to/static/src/js/test_mail_to.js diff --git a/mail_to/__init__.py b/mail_to/__init__.py index e69de29..2bb4063 100644 --- a/mail_to/__init__.py +++ b/mail_to/__init__.py @@ -0,0 +1,2 @@ +# License LGPL-3.0 (https://www.gnu.org/licenses/lgpl.html). +from . import models diff --git a/mail_to/__manifest__.py b/mail_to/__manifest__.py index c7b332e..4e9e942 100644 --- a/mail_to/__manifest__.py +++ b/mail_to/__manifest__.py @@ -1,9 +1,15 @@ +# Copyright 2016 x620 +# Copyright 2016 Ivan Yelizariev +# Copyright 2018 Ruslan Ronzhin +# Copyright 2019 Artem Rafailov +# License LGPL-3.0 (https://www.gnu.org/licenses/lgpl.html). { "name": """Show message recipients""", "summary": """Allows you be sure, that all discussion participants were notified""", "category": "Discuss", - "images": ["images/1.png"], - "version": "12.0.1.0.1", + "images": ['images/1.png'], + "version": "12.0.1.1.0", + "author": "IT-Projects LLC, Pavel Romanchenko", "support": "apps@itpp.dev", "website": "https://it-projects.info", diff --git a/mail_to/doc/changelog.rst b/mail_to/doc/changelog.rst index ea27aff..3e341ea 100644 --- a/mail_to/doc/changelog.rst +++ b/mail_to/doc/changelog.rst @@ -1,3 +1,9 @@ +`1.1.0` +------- + +- **New**: Channels are displayed in recipients + + `1.0.1` ------- diff --git a/mail_to/i18n/de.po b/mail_to/i18n/de.po index 88a1cc8..967bc16 100644 --- a/mail_to/i18n/de.po +++ b/mail_to/i18n/de.po @@ -5,7 +5,7 @@ # Translators: # Dawid Runowski , 2019 # Ermin Trevisan , 2019 -# +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" @@ -13,7 +13,8 @@ msgstr "" "POT-Creation-Date: 2018-05-05 23:09+0000\n" "PO-Revision-Date: 2018-04-21 00:05+0000\n" "Last-Translator: Ermin Trevisan , 2019\n" -"Language-Team: German (https://www.transifex.com/it-projects-llc/teams/76080/de/)\n" +"Language-Team: German (https://www.transifex.com/it-projects-llc/teams/76080/" +"de/)\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/mail_to/i18n/mail_to.pot b/mail_to/i18n/mail_to.pot index 795c369..277895a 100644 --- a/mail_to/i18n/mail_to.pot +++ b/mail_to/i18n/mail_to.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 12.0\n" +"Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: <>\n" "Language-Team: \n" @@ -13,23 +13,36 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" +#. module: mail_to +#: model:ir.model,name:mail_to.model_mail_message +msgid "Message" +msgstr "" + +#. module: mail_to +#. openerp-web +#: code:addons/mail_to/static/src/js/test_mail_to.js:13 +#, python-format +msgid "Open Partners Form From Recipient Link" +msgstr "" + #. module: mail_to #. openerp-web #: code:addons/mail_to/static/src/xml/recipient.xml:10 +#: code:addons/mail_to/static/src/xml/recipient.xml:11 #, python-format msgid "To:" msgstr "" #. module: mail_to #. openerp-web -#: code:addons/mail_to/static/src/xml/recipient.xml:24 +#: code:addons/mail_to/static/src/xml/recipient.xml:32 #, python-format msgid "and" msgstr "" #. module: mail_to #. openerp-web -#: code:addons/mail_to/static/src/xml/recipient.xml:25 +#: code:addons/mail_to/static/src/xml/recipient.xml:33 #, python-format msgid "more" msgstr "" diff --git a/mail_to/i18n/sl.po b/mail_to/i18n/sl.po index 30218b8..3c3d6b0 100644 --- a/mail_to/i18n/sl.po +++ b/mail_to/i18n/sl.po @@ -1,10 +1,10 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * mail_to -# +# # Translators: # Matjaz Mozetic , 2019 -# +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" @@ -12,12 +12,14 @@ msgstr "" "POT-Creation-Date: 2018-05-05 23:09+0000\n" "PO-Revision-Date: 2018-04-21 00:05+0000\n" "Last-Translator: Matjaz Mozetic , 2019\n" -"Language-Team: Slovenian (https://www.transifex.com/it-projects-llc/teams/76080/sl/)\n" +"Language-Team: Slovenian (https://www.transifex.com/it-projects-llc/" +"teams/76080/sl/)\n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: sl\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" +"%100==4 ? 2 : 3);\n" #. module: mail_to #. openerp-web diff --git a/mail_to/models/__init__.py b/mail_to/models/__init__.py new file mode 100644 index 0000000..a2bc21b --- /dev/null +++ b/mail_to/models/__init__.py @@ -0,0 +1 @@ +from . import mail_message diff --git a/mail_to/models/mail_message.py b/mail_to/models/mail_message.py new file mode 100644 index 0000000..f7a75f4 --- /dev/null +++ b/mail_to/models/mail_message.py @@ -0,0 +1,29 @@ +# Copyright 2019 Artem Rafailov +# License LGPL-3.0 (https://www.gnu.org/licenses/lgpl.html). +from odoo import models, api + + +class MailMessage(models.Model): + _inherit = 'mail.message' + + # взято с mail_base + @api.multi + def write(self, values): + if values.get('needaction_partner_ids'): + if not values.get('partner_ids'): + values['partner_ids'] = [] + for triplet in values.get('needaction_partner_ids'): + if triplet[0] == 6: + for i in triplet[2]: + values['partner_ids'].append((4, i, False)) + return super(MailMessage, self).write(values) + + @api.multi + def message_format(self): + messages_values = super(MailMessage, self).message_format() + for i in messages_values: + if i['channel_ids']: + i['channel_names'] = self.env['mail.channel'].browse(i['channel_ids']).mapped( + lambda r: [r.id, '#' + r.display_name]) + + return messages_values diff --git a/mail_to/static/src/js/mail_to.js b/mail_to/static/src/js/mail_to.js new file mode 100644 index 0000000..88031d5 --- /dev/null +++ b/mail_to/static/src/js/mail_to.js @@ -0,0 +1,42 @@ +/* Copyright 2016 x620 + * Copyright 2016-2017 Ivan Yelizariev + * Copyright 2017 Artyom Losev + * Copyright 2019 Artem Rafailov + * License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). */ +odoo.define('mail_to.MailTo', function (require) { + "use strict"; + + var MailManager = require("mail.Manager"); + MailManager.include({ + _makeMessage: function(data) { + var msg = this._super(data); + + msg.partner_ids = data.partner_ids; + msg.channel_names = data.channel_names; + msg.channel_ids = data.channel_ids; + msg.recipients = data.partner_ids.concat(data.channel_names); + if (!msg.partner_ids && !msg.channel_names) { + return msg; + } + + var more_recipients = ''; + // value which define more recipients + msg.more_recipients_value = 4; + for (var i = 0; i < msg.recipients.length; i++){ + if (i >= msg.more_recipients_value){ + // append names + more_recipients += msg.recipients[i][1]; + // separate them with semicolon + if (i < msg.recipients.length - 1){ + more_recipients += '; '; + } + } + } + + msg.more_recipients = more_recipients; + return msg; + } + }); + + return MailManager; +}); diff --git a/mail_to/static/src/js/test_mail_to.js b/mail_to/static/src/js/test_mail_to.js new file mode 100644 index 0000000..ff20b9d --- /dev/null +++ b/mail_to/static/src/js/test_mail_to.js @@ -0,0 +1,20 @@ +/* Copyright 2018 Artem Rafailov + License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).*/ +odoo.define('mail_to.tour', function (require) { + "use strict"; + + var tour = require("web_tour.tour"); + var core = require('web.core'); + var _t = core._t; + + var email = 'mail_private test email'; + var steps = [{ + trigger: 'a.recipient_link:first', + content: _t("Open Partners Form From Recipient Link"), + position: 'bottom', + timeout: 70000, + }]; + + tour.register('mail_to_tour', { test: true, url: '/web' }, steps); + +}); diff --git a/mail_to/static/src/xml/recipient.xml b/mail_to/static/src/xml/recipient.xml index e6d843b..5838bdb 100644 --- a/mail_to/static/src/xml/recipient.xml +++ b/mail_to/static/src/xml/recipient.xml @@ -1,29 +1,43 @@ - + + diff --git a/mail_to/templates.xml b/mail_to/templates.xml index 846c8c8..c847cea 100644 --- a/mail_to/templates.xml +++ b/mail_to/templates.xml @@ -1,4 +1,8 @@ - + + diff --git a/mail_to/tests/__init__.py b/mail_to/tests/__init__.py index 7ea835c..d8b94c0 100644 --- a/mail_to/tests/__init__.py +++ b/mail_to/tests/__init__.py @@ -1 +1,2 @@ +# License LGPL-3.0 (https://www.gnu.org/licenses/lgpl.html). from . import test_default diff --git a/mail_to/tests/test_default.py b/mail_to/tests/test_default.py index c8a4f74..d0bf499 100644 --- a/mail_to/tests/test_default.py +++ b/mail_to/tests/test_default.py @@ -1,6 +1,9 @@ -from werkzeug import url_encode - +# Copyright 2018 Ivan Yelizariev +# Copyright 2018 Artyom Losev +# Copyright 2019 Kolushov Alexandr +# License LGPL-3.0 (https://www.gnu.org/licenses/lgpl.html). import odoo.tests +from werkzeug import url_encode @odoo.tests.common.at_install(True) From 78b661784791b9e2a8cb1d45e4ae7e5d850a980e Mon Sep 17 00:00:00 2001 From: Vildan Safin Date: Fri, 7 Aug 2020 12:39:47 +0500 Subject: [PATCH 2/6] :book: Added copyrights Signed-off-by: Vildan Safin --- mail_to/models/mail_message.py | 1 + mail_to/static/src/js/mail_to.js | 1 + 2 files changed, 2 insertions(+) diff --git a/mail_to/models/mail_message.py b/mail_to/models/mail_message.py index f7a75f4..ff4cd85 100644 --- a/mail_to/models/mail_message.py +++ b/mail_to/models/mail_message.py @@ -1,4 +1,5 @@ # Copyright 2019 Artem Rafailov +# Copyright 2019 Eugene Molotov # License LGPL-3.0 (https://www.gnu.org/licenses/lgpl.html). from odoo import models, api diff --git a/mail_to/static/src/js/mail_to.js b/mail_to/static/src/js/mail_to.js index 88031d5..72e06e9 100644 --- a/mail_to/static/src/js/mail_to.js +++ b/mail_to/static/src/js/mail_to.js @@ -2,6 +2,7 @@ * Copyright 2016-2017 Ivan Yelizariev * Copyright 2017 Artyom Losev * Copyright 2019 Artem Rafailov + * Copyright 2019-2020 Eugene Molotov * License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). */ odoo.define('mail_to.MailTo', function (require) { "use strict"; From 3d1ba145a5ddac45a4a26c3ed7a8816f667bf370 Mon Sep 17 00:00:00 2001 From: Vildan Safin Date: Tue, 11 Aug 2020 20:45:21 +0500 Subject: [PATCH 3/6] :green_heart: mail_to: Fixing tours Signed-off-by: Vildan Safin --- mail_to/static/src/js/mail_to.js | 2 +- mail_to/static/src/js/test_mail_to.js | 28 ++++++++++++++++++++------- mail_to/templates.xml | 1 + mail_to/tests/test_default.py | 9 ++------- 4 files changed, 25 insertions(+), 15 deletions(-) diff --git a/mail_to/static/src/js/mail_to.js b/mail_to/static/src/js/mail_to.js index 72e06e9..8336088 100644 --- a/mail_to/static/src/js/mail_to.js +++ b/mail_to/static/src/js/mail_to.js @@ -15,7 +15,7 @@ odoo.define('mail_to.MailTo', function (require) { msg.partner_ids = data.partner_ids; msg.channel_names = data.channel_names; msg.channel_ids = data.channel_ids; - msg.recipients = data.partner_ids.concat(data.channel_names); + msg.recipients = data.partner_ids.concat(data.channel_names ? data.channel_names : []); if (!msg.partner_ids && !msg.channel_names) { return msg; } diff --git a/mail_to/static/src/js/test_mail_to.js b/mail_to/static/src/js/test_mail_to.js index ff20b9d..2a72ccd 100644 --- a/mail_to/static/src/js/test_mail_to.js +++ b/mail_to/static/src/js/test_mail_to.js @@ -7,13 +7,27 @@ odoo.define('mail_to.tour', function (require) { var core = require('web.core'); var _t = core._t; - var email = 'mail_private test email'; - var steps = [{ - trigger: 'a.recipient_link:first', - content: _t("Open Partners Form From Recipient Link"), - position: 'bottom', - timeout: 70000, - }]; + var steps = [tour.STEPS.SHOW_APPS_MENU_ITEM, { + trigger: '.o_app[data-menu-xmlid="mail.menu_root_discuss"]', + content: _t('Want to get in touch with your contacts? Discuss with them here.'), + position: 'right', + edition: 'community', + },{ + trigger: '.fa.fa-plus.o_add[data-type="public"]', + position: 'right', + edition: 'community', + run: function (actions) { + $('.o_input.ui-autocomplete-input').val("Channel #" + String(new Date().getTime())); + $('.o_input.ui-autocomplete-input').keydown(); + setTimeout(function(){ + $('.ui-menu-item > a').click(); + }, 1000); + }, + },{ + trigger: 'a.recipient_link:first', + content: _t("Open Partners Form From Recipient Link"), + position: 'bottom', + }]; tour.register('mail_to_tour', { test: true, url: '/web' }, steps); diff --git a/mail_to/templates.xml b/mail_to/templates.xml index c847cea..3bbe48e 100644 --- a/mail_to/templates.xml +++ b/mail_to/templates.xml @@ -13,6 +13,7 @@ + diff --git a/mail_to/tests/test_default.py b/mail_to/tests/test_default.py index d0bf499..b25d4d1 100644 --- a/mail_to/tests/test_default.py +++ b/mail_to/tests/test_default.py @@ -41,16 +41,11 @@ class TestUi(odoo.tests.HttpCase): env["mail.notification"].create( {"res_partner_id": p, "mail_message_id": msg.id, "is_read": False} ) - code = """ - setTimeout(function () { - console.log($('a.recipient_link').length && 'ok' || 'error'); - }, 3000); - """ link = "/web#%s" % url_encode({"action": "mail.action_discuss"}) self.phantom_js( link, - code, - "odoo.__DEBUG__.services['web_tour.tour'].tours.mail_tour.ready", + "odoo.__DEBUG__.services['web_tour.tour'].run('mail_to_tour', 1000);", + "odoo.__DEBUG__.services['web_tour.tour'].tours.mail_to_tour.ready", login="admin", ) From e9a5a54a5cf17e78b72ae6df83ed9bf727614621 Mon Sep 17 00:00:00 2001 From: Vildan Safin Date: Tue, 11 Aug 2020 21:02:49 +0500 Subject: [PATCH 4/6] :tv: mail_to: Corrected case, when recipients more than 4 Signed-off-by: Vildan Safin --- mail_to/static/src/xml/recipient.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/mail_to/static/src/xml/recipient.xml b/mail_to/static/src/xml/recipient.xml index 5838bdb..19acdbb 100644 --- a/mail_to/static/src/xml/recipient.xml +++ b/mail_to/static/src/xml/recipient.xml @@ -15,11 +15,6 @@ ; ; - - - and more - - From b92179f6e3c5b188b3382a10eb832578d484e7a0 Mon Sep 17 00:00:00 2001 From: Vildan Safin Date: Wed, 19 Aug 2020 15:18:31 +0500 Subject: [PATCH 5/6] :book: mail_to: Changed license Signed-off-by: Vildan Safin --- mail_to/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mail_to/__manifest__.py b/mail_to/__manifest__.py index 4e9e942..6d7aa35 100644 --- a/mail_to/__manifest__.py +++ b/mail_to/__manifest__.py @@ -13,7 +13,7 @@ "author": "IT-Projects LLC, Pavel Romanchenko", "support": "apps@itpp.dev", "website": "https://it-projects.info", - "license": "Other OSI approved licence", # MIT + "license": "LGPL-3", "price": 40.00, "currency": "EUR", "depends": ["mail"], From 9610732f11c1c0dc0f0d904582324a8c209be5c1 Mon Sep 17 00:00:00 2001 From: Vildan Safin Date: Wed, 19 Aug 2020 16:40:49 +0500 Subject: [PATCH 6/6] :rainbow: mail_to: pre-commit auto cleanup Signed-off-by: Vildan Safin --- mail_to/__manifest__.py | 3 +- mail_to/models/mail_message.py | 23 ++++++---- mail_to/static/src/js/mail_to.js | 28 ++++++------ mail_to/static/src/js/test_mail_to.js | 56 +++++++++++++---------- mail_to/static/src/xml/recipient.xml | 66 +++++++++++++++++---------- mail_to/templates.xml | 14 ++++-- mail_to/tests/test_default.py | 3 +- 7 files changed, 116 insertions(+), 77 deletions(-) diff --git a/mail_to/__manifest__.py b/mail_to/__manifest__.py index 6d7aa35..9844b2e 100644 --- a/mail_to/__manifest__.py +++ b/mail_to/__manifest__.py @@ -7,9 +7,8 @@ "name": """Show message recipients""", "summary": """Allows you be sure, that all discussion participants were notified""", "category": "Discuss", - "images": ['images/1.png'], + "images": ["images/1.png"], "version": "12.0.1.1.0", - "author": "IT-Projects LLC, Pavel Romanchenko", "support": "apps@itpp.dev", "website": "https://it-projects.info", diff --git a/mail_to/models/mail_message.py b/mail_to/models/mail_message.py index ff4cd85..3707504 100644 --- a/mail_to/models/mail_message.py +++ b/mail_to/models/mail_message.py @@ -1,30 +1,33 @@ # Copyright 2019 Artem Rafailov # Copyright 2019 Eugene Molotov # License LGPL-3.0 (https://www.gnu.org/licenses/lgpl.html). -from odoo import models, api +from odoo import api, models class MailMessage(models.Model): - _inherit = 'mail.message' + _inherit = "mail.message" # взято с mail_base @api.multi def write(self, values): - if values.get('needaction_partner_ids'): - if not values.get('partner_ids'): - values['partner_ids'] = [] - for triplet in values.get('needaction_partner_ids'): + if values.get("needaction_partner_ids"): + if not values.get("partner_ids"): + values["partner_ids"] = [] + for triplet in values.get("needaction_partner_ids"): if triplet[0] == 6: for i in triplet[2]: - values['partner_ids'].append((4, i, False)) + values["partner_ids"].append((4, i, False)) return super(MailMessage, self).write(values) @api.multi def message_format(self): messages_values = super(MailMessage, self).message_format() for i in messages_values: - if i['channel_ids']: - i['channel_names'] = self.env['mail.channel'].browse(i['channel_ids']).mapped( - lambda r: [r.id, '#' + r.display_name]) + if i["channel_ids"]: + i["channel_names"] = ( + self.env["mail.channel"] + .browse(i["channel_ids"]) + .mapped(lambda r: [r.id, "#" + r.display_name]) + ) return messages_values diff --git a/mail_to/static/src/js/mail_to.js b/mail_to/static/src/js/mail_to.js index 8336088..7d7589f 100644 --- a/mail_to/static/src/js/mail_to.js +++ b/mail_to/static/src/js/mail_to.js @@ -4,7 +4,7 @@ * Copyright 2019 Artem Rafailov * Copyright 2019-2020 Eugene Molotov * License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). */ -odoo.define('mail_to.MailTo', function (require) { +odoo.define("mail_to.MailTo", function(require) { "use strict"; var MailManager = require("mail.Manager"); @@ -15,28 +15,30 @@ odoo.define('mail_to.MailTo', function (require) { msg.partner_ids = data.partner_ids; msg.channel_names = data.channel_names; msg.channel_ids = data.channel_ids; - msg.recipients = data.partner_ids.concat(data.channel_names ? data.channel_names : []); + msg.recipients = data.partner_ids.concat( + data.channel_names ? data.channel_names : [] + ); if (!msg.partner_ids && !msg.channel_names) { return msg; } - var more_recipients = ''; - // value which define more recipients + var more_recipients = ""; + // Value which define more recipients msg.more_recipients_value = 4; - for (var i = 0; i < msg.recipients.length; i++){ - if (i >= msg.more_recipients_value){ - // append names - more_recipients += msg.recipients[i][1]; - // separate them with semicolon - if (i < msg.recipients.length - 1){ - more_recipients += '; '; - } + for (var i = 0; i < msg.recipients.length; i++) { + if (i >= msg.more_recipients_value) { + // Append names + more_recipients += msg.recipients[i][1]; + // Separate them with semicolon + if (i < msg.recipients.length - 1) { + more_recipients += "; "; } + } } msg.more_recipients = more_recipients; return msg; - } + }, }); return MailManager; diff --git a/mail_to/static/src/js/test_mail_to.js b/mail_to/static/src/js/test_mail_to.js index 2a72ccd..588b50b 100644 --- a/mail_to/static/src/js/test_mail_to.js +++ b/mail_to/static/src/js/test_mail_to.js @@ -1,34 +1,42 @@ /* Copyright 2018 Artem Rafailov License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).*/ -odoo.define('mail_to.tour', function (require) { +odoo.define("mail_to.tour", function(require) { "use strict"; var tour = require("web_tour.tour"); - var core = require('web.core'); + var core = require("web.core"); var _t = core._t; - var steps = [tour.STEPS.SHOW_APPS_MENU_ITEM, { - trigger: '.o_app[data-menu-xmlid="mail.menu_root_discuss"]', - content: _t('Want to get in touch with your contacts? Discuss with them here.'), - position: 'right', - edition: 'community', - },{ - trigger: '.fa.fa-plus.o_add[data-type="public"]', - position: 'right', - edition: 'community', - run: function (actions) { - $('.o_input.ui-autocomplete-input').val("Channel #" + String(new Date().getTime())); - $('.o_input.ui-autocomplete-input').keydown(); - setTimeout(function(){ - $('.ui-menu-item > a').click(); - }, 1000); + var steps = [ + tour.STEPS.SHOW_APPS_MENU_ITEM, + { + trigger: '.o_app[data-menu-xmlid="mail.menu_root_discuss"]', + content: _t( + "Want to get in touch with your contacts? Discuss with them here." + ), + position: "right", + edition: "community", }, - },{ - trigger: 'a.recipient_link:first', - content: _t("Open Partners Form From Recipient Link"), - position: 'bottom', - }]; - - tour.register('mail_to_tour', { test: true, url: '/web' }, steps); + { + trigger: '.fa.fa-plus.o_add[data-type="public"]', + position: "right", + edition: "community", + run: function(actions) { + $(".o_input.ui-autocomplete-input").val( + "Channel #" + String(new Date().getTime()) + ); + $(".o_input.ui-autocomplete-input").keydown(); + setTimeout(function() { + $(".ui-menu-item > a").click(); + }, 1000); + }, + }, + { + trigger: "a.recipient_link:first", + content: _t("Open Partners Form From Recipient Link"), + position: "bottom", + }, + ]; + tour.register("mail_to_tour", {test: true, url: "/web"}, steps); }); diff --git a/mail_to/static/src/xml/recipient.xml b/mail_to/static/src/xml/recipient.xml index 19acdbb..cf8343e 100644 --- a/mail_to/static/src/xml/recipient.xml +++ b/mail_to/static/src/xml/recipient.xml @@ -1,4 +1,4 @@ - +