From 6f246d7fa2680826a63ece090f9be3db58040b18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Theys?= Date: Fri, 16 Jun 2023 08:48:49 +0000 Subject: [PATCH] [REF] mail: move attachment deletable condition to discuss folder Part of task-3265211 Part-of: odoo/odoo#125388 --- addons/mail/static/src/core/common/attachment_model.js | 3 --- .../src/discuss/core/common/attachment_model_patch.js | 6 ++++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/addons/mail/static/src/core/common/attachment_model.js b/addons/mail/static/src/core/common/attachment_model.js index 66cf0af33fd..98b2f93dc50 100644 --- a/addons/mail/static/src/core/common/attachment_model.js +++ b/addons/mail/static/src/core/common/attachment_model.js @@ -31,9 +31,6 @@ export class Attachment { } get isDeletable() { - if (this.message && this.originThread?.model === "discuss.channel") { - return this.message.editable; - } return true; } diff --git a/addons/mail/static/src/discuss/core/common/attachment_model_patch.js b/addons/mail/static/src/discuss/core/common/attachment_model_patch.js index e65b40e59c4..464f34913bc 100644 --- a/addons/mail/static/src/discuss/core/common/attachment_model_patch.js +++ b/addons/mail/static/src/discuss/core/common/attachment_model_patch.js @@ -5,6 +5,12 @@ import { Attachment } from "@mail/core/common/attachment_model"; import { patch } from "@web/core/utils/patch"; patch(Attachment.prototype, "discuss/core/common", { + get isDeletable() { + if (this.message && this.originThread?.model === "discuss.channel") { + return this.message.editable; + } + return this._super(); + }, get urlRoute() { if (!this.accessToken && this.originThread?.model === "discuss.channel") { return this.isImage