diff options
| author | Sébastien Theys <seb@odoo.com> | 2020-08-28 12:53:38 +0000 |
|---|---|---|
| committer | Sébastien Theys <seb@odoo.com> | 2020-08-28 16:15:15 +0000 |
| commit | 17611f4adc5e950b0a75a2a6615b1da3c956387f (patch) | |
| tree | ede6cbc0bc67c1dceed3b5ca6c1bb3e08389675c /addons/mail/static/src/components/thread_view | |
| parent | 5ba64925fd846e9a9a4884913e3d1004d05ecdf6 (diff) | |
[FIX] mail, *: fix opens and redirects, adapt messaging menu close
task-2244279
task-2262862
task-2274993
task-2277537
task-2282238
closes odoo/odoo#56745
X-original-commit: 109f202
Related: odoo/enterprise#12761
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
Diffstat (limited to 'addons/mail/static/src/components/thread_view')
3 files changed, 3 insertions, 4 deletions
diff --git a/addons/mail/static/src/components/thread_view/thread_view.js b/addons/mail/static/src/components/thread_view/thread_view.js index 7b1680f31a8..395fac68474 100644 --- a/addons/mail/static/src/components/thread_view/thread_view.js +++ b/addons/mail/static/src/components/thread_view/thread_view.js @@ -132,7 +132,6 @@ Object.assign(ThreadView, { hasComposer: false, hasMessageCheckbox: false, hasSquashCloseMessages: false, - haveMessagesAuthorRedirect: false, haveMessagesMarkAsReadIcon: false, haveMessagesReplyIcon: false, order: 'asc', @@ -168,7 +167,6 @@ Object.assign(ThreadView, { optional: true, }, hasSquashCloseMessages: Boolean, - haveMessagesAuthorRedirect: Boolean, haveMessagesMarkAsReadIcon: Boolean, haveMessagesReplyIcon: Boolean, order: { diff --git a/addons/mail/static/src/components/thread_view/thread_view.xml b/addons/mail/static/src/components/thread_view/thread_view.xml index 30844135e65..eead567fa1e 100644 --- a/addons/mail/static/src/components/thread_view/thread_view.xml +++ b/addons/mail/static/src/components/thread_view/thread_view.xml @@ -15,7 +15,6 @@ hasMessageCheckbox="props.hasMessageCheckbox" hasScrollAdjust="props.hasScrollAdjust" hasSquashCloseMessages="props.hasSquashCloseMessages" - haveMessagesAuthorRedirect="props.haveMessagesAuthorRedirect" haveMessagesMarkAsReadIcon="props.haveMessagesMarkAsReadIcon" haveMessagesReplyIcon="props.haveMessagesReplyIcon" order="props.order" diff --git a/addons/mail/static/src/components/thread_view/thread_view_tests.js b/addons/mail/static/src/components/thread_view/thread_view_tests.js index 06832473b99..c8f41632ae3 100644 --- a/addons/mail/static/src/components/thread_view/thread_view_tests.js +++ b/addons/mail/static/src/components/thread_view/thread_view_tests.js @@ -304,7 +304,7 @@ QUnit.test('mark channel as fetched when a new message is loaded and as seen whe "Channel should have been fetched but not seen yet" ); - await afterNextRender(() => thread.composer.focus()); + await afterNextRender(() => document.querySelector('.o_ComposerTextInput_textarea').focus()); assert.verifySteps( ['rpc:channel_seen'], "Channel should have been marked as seen after threadView got the focus" @@ -355,6 +355,8 @@ QUnit.test('mark channel as fetched and seen when a new message is loaded if com const threadView = this.env.models['mail.thread_view'].create({ thread: [['link', thread]] }); await this.createThreadViewComponent(threadView, { hasComposer: true }); + + document.querySelector('.o_ComposerTextInput_textarea').focus(); const notifications = [ [['myDB', 'mail.channel', 100], { channelId: 100, |