github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-24 10:54:22 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Always reload post's raw when editing a post (#14085)

Browse Source 
Sometimes the message bus update can be delayed and editing a post when
that happens will automatically result in a draft conflict.
This commit is contained in:
Bianca Nenciu 2021-08-19 15:29:48 +03:00 committed by GitHub
parent 5eb4e642a6
commit a56122f2d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/assets/javascripts/discourse/app/models/composer.js
View File

@ -831,22 +831,13 @@ const Composer = RestModel.extend({
this.setProperties(topicProps); this.setProperties(topicProps);
promise = promise.then(() => { promise = promise.then(() => {
let rawPromise = Promise.resolve(); let rawPromise = this.store.find("post", opts.post.id).then((post) => {
if (!this.post.raw) {
rawPromise = this.store.find("post", opts.post.id).then((post) => {
this.setProperties({
post,
reply: post.raw,
originalText: post.raw,
});
});
} else {
this.setProperties({ this.setProperties({
reply: this.post.raw, post,
originalText: this.post.raw, reply: post.raw,
originalText: post.raw,
}); });
} });
// edge case ... make a post then edit right away // edge case ... make a post then edit right away
// store does not have topic for the post // store does not have topic for the post