From a56122f2d302a86305cd6525571d72b1b41e1608 Mon Sep 17 00:00:00 2001 From: Bianca Nenciu Date: Thu, 19 Aug 2021 15:29:48 +0300 Subject: [PATCH] FIX: Always reload post's raw when editing a post (#14085) Sometimes the message bus update can be delayed and editing a post when that happens will automatically result in a draft conflict. --- .../discourse/app/models/composer.js | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/app/assets/javascripts/discourse/app/models/composer.js b/app/assets/javascripts/discourse/app/models/composer.js index 85c69ad880c..c74a640eac5 100644 --- a/app/assets/javascripts/discourse/app/models/composer.js +++ b/app/assets/javascripts/discourse/app/models/composer.js @@ -831,22 +831,13 @@ const Composer = RestModel.extend({ this.setProperties(topicProps); promise = promise.then(() => { - let rawPromise = Promise.resolve(); - - if (!this.post.raw) { - rawPromise = this.store.find("post", opts.post.id).then((post) => { - this.setProperties({ - post, - reply: post.raw, - originalText: post.raw, - }); - }); - } else { + let rawPromise = this.store.find("post", opts.post.id).then((post) => { this.setProperties({ - reply: this.post.raw, - originalText: this.post.raw, + post, + reply: post.raw, + originalText: post.raw, }); - } + }); // edge case ... make a post then edit right away // store does not have topic for the post