[MERGE] forward port branch saas-11.3 up to 387d5cff90b

closes odoo/odoo#30566

2 files changed, 3 insertions, 1 deletions

diff --git a/addons/mail/static/src/js/chatter.js b/addons/mail/static/src/js/chatter.js
index d32a9327068..7f3ca1cb202 100644
--- a/addons/mail/static/src/js/chatter.js
+++ b/addons/mail/static/src/js/chatter.js
@@ -266,6 +266,7 @@ var Chatter = Widget.extend({
             recordName: this.recordName,
             defaultBody: oldComposer && oldComposer.$input && oldComposer.$input.val(),
             defaultMentionSelections: oldComposer && oldComposer.getMentionListenerSelections(),
+            attachmentIds: (oldComposer && oldComposer.get('attachment_ids')) || [],
         });
         this._composer.on('input_focused', this, function () {
             this._composer.mentionSetPrefetchedPartners(this._mentionSuggestions || []);
diff --git a/addons/mail/static/src/js/composers/basic_composer.js b/addons/mail/static/src/js/composers/basic_composer.js
index 8a533cd4515..0e25b3cdccf 100644
--- a/addons/mail/static/src/js/composers/basic_composer.js
+++ b/addons/mail/static/src/js/composers/basic_composer.js
@@ -56,7 +56,7 @@ var BasicComposer = Widget.extend({
         // Attachments
         this._attachmentDataSet = new data.DataSetSearch(this, 'ir.attachment', this.context);
         this.fileuploadID = _.uniqueId('o_chat_fileupload');
-        this.set('attachment_ids', []);
+        this.set('attachment_ids', options.attachmentIds || []);
 
         // Mention
         this._mentionManager = new MentionManager(this);
@@ -118,6 +118,7 @@ var BasicComposer = Widget.extend({
         });
 
         // Attachments
+        this._renderAttachments();
         $(window).on(this.fileuploadID, this._onAttachmentLoaded.bind(this));
         this.on('change:attachment_ids', this, this._renderAttachments);