summaryrefslogtreecommitdiff
path: root/addons/mail/static/src/widgets
diff options
context:
space:
mode:
authorSébastien Theys <seb@odoo.com>2020-08-28 10:16:37 +0000
committerSébastien Theys <seb@odoo.com>2020-08-28 13:43:54 +0000
commitf9ee1cf5f904116e4d1d70a8eaf4ee1d58b18a3a (patch)
tree89425d0677083bb9489e42d47521c4bcf1e4ff44 /addons/mail/static/src/widgets
parent98e12901c97a67dc87f21647473754cd6f384d4a (diff)
[FIX] mail, *: rename thread viewer to thread view
The "viewer" should be the "parent" not the view itself. This distinction will become important in a future commit to allow viewers to not display the view in some situations. Rename done as a standalone commit to ease diff readability. Part of task-2310623 closes odoo/odoo#56737 X-original-commit: 1b811e6a972d72de02965adda67c5b039bee023f Related: odoo/enterprise#12756 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/widgets')
-rw-r--r--addons/mail/static/src/widgets/discuss/discuss.js20
-rw-r--r--addons/mail/static/src/widgets/form_renderer/form_renderer_tests.js2
2 files changed, 11 insertions, 11 deletions
diff --git a/addons/mail/static/src/widgets/discuss/discuss.js b/addons/mail/static/src/widgets/discuss/discuss.js
index e830bffb774..bf389ee69bc 100644
--- a/addons/mail/static/src/widgets/discuss/discuss.js
+++ b/addons/mail/static/src/widgets/discuss/discuss.js
@@ -192,7 +192,7 @@ const DiscussWidget = AbstractAction.extend({
this.$buttons
.find('.o_widget_Discuss_controlPanelButtonMarkAllRead')
.removeClass('o_hidden')
- .prop('disabled', this.discuss.threadViewer.messages.length === 0);
+ .prop('disabled', this.discuss.threadView.messages.length === 0);
} else {
this.$buttons
.find('.o_widget_Discuss_controlPanelButtonMarkAllRead')
@@ -206,7 +206,7 @@ const DiscussWidget = AbstractAction.extend({
this.$buttons
.find('.o_unstar_all')
.removeClass('o_hidden')
- .prop('disabled', this.discuss.threadViewer.messages.length === 0);
+ .prop('disabled', this.discuss.threadView.messages.length === 0);
} else {
this.$buttons
.find('.o_unstar_all')
@@ -243,13 +243,13 @@ const DiscussWidget = AbstractAction.extend({
const $unselectAll = this.$buttons.find('.o_widget_Discuss_controlPanelButtonUnselectAll');
if (
- this.discuss.threadViewer.checkedMessages.length > 0 ||
- this.discuss.threadViewer.uncheckedMessages.length > 0
+ this.discuss.threadView.checkedMessages.length > 0 ||
+ this.discuss.threadView.uncheckedMessages.length > 0
) {
$selectAll.removeClass('o_hidden');
- $selectAll.toggleClass('disabled', this.discuss.threadViewer.uncheckedMessages.length === 0);
+ $selectAll.toggleClass('disabled', this.discuss.threadView.uncheckedMessages.length === 0);
$unselectAll.removeClass('o_hidden');
- $unselectAll.toggleClass('disabled', this.discuss.threadViewer.checkedMessages.length === 0);
+ $unselectAll.toggleClass('disabled', this.discuss.threadView.checkedMessages.length === 0);
} else {
$selectAll.addClass('o_hidden');
$selectAll.addClass('disabled');
@@ -260,8 +260,8 @@ const DiscussWidget = AbstractAction.extend({
// Moderation Actions
const $moderationButtons = this.$buttons.find('.o_widget_Discuss_controlPanelButtonModeration');
if (
- this.discuss.threadViewer.checkedMessages.length > 0 &&
- this.discuss.threadViewer.checkedMessages.filter(
+ this.discuss.threadView.checkedMessages.length > 0 &&
+ this.discuss.threadView.checkedMessages.filter(
message => !message.isModeratedByCurrentPartner
).length === 0
) {
@@ -326,7 +326,7 @@ const DiscussWidget = AbstractAction.extend({
*/
_onClickModerationAccept() {
this.env.models['mail.message'].moderate(
- this.discuss.threadViewer.checkedMessages,
+ this.discuss.threadView.checkedMessages,
'accept'
);
},
@@ -371,7 +371,7 @@ const DiscussWidget = AbstractAction.extend({
* @param {Object} searchQuery
*/
_onSearch: function (searchQuery) {
- this.discuss.threadViewer.update({
+ this.discuss.threadView.update({
stringifiedDomain: JSON.stringify(searchQuery.domain),
});
},
diff --git a/addons/mail/static/src/widgets/form_renderer/form_renderer_tests.js b/addons/mail/static/src/widgets/form_renderer/form_renderer_tests.js
index a3a38d5f140..465745feb41 100644
--- a/addons/mail/static/src/widgets/form_renderer/form_renderer_tests.js
+++ b/addons/mail/static/src/widgets/form_renderer/form_renderer_tests.js
@@ -815,7 +815,7 @@ QUnit.test('Form view not scrolled when switching record', async function (asser
await afterNextRender(async () => {
controllerContentEl.scrollTop = controllerContentEl.scrollHeight - controllerContentEl.offsetHeight;
await triggerEvent(
- document.querySelector('.o_ThreadViewer_messageList'),
+ document.querySelector('.o_ThreadView_messageList'),
'scroll'
);
});