Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: quote dropped when replying as new topic

This commit is contained in:
Sam 2017-11-27 10:08:55 +11:00
parent 4b919cd735
commit a74ac90bf5
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/discourse/controllers/topic.js.es6
View File

@ -131,9 +131,11 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
const composer = this.get('composer');
const viewOpen = composer.get('model.viewOpen');
const quotedText = Quote.build(post, buffer);
// If we can't create a post, delegate to reply as new topic
if ((!viewOpen) && (!this.get('model.details.can_create_post'))) {
this.send('replyAsNewTopic', post);
this.send('replyAsNewTopic', post, quotedText);
return;
}
@ -154,7 +156,6 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
composerOpts.post = composerPost;
}
const quotedText = Quote.build(post, buffer);
composerOpts.quote = quotedText;
if (composer.get('model.viewOpen')) {
this.appEvents.trigger('composer:insert-block', quotedText);
@ -623,11 +624,11 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
}
},
replyAsNewTopic(post) {
replyAsNewTopic(post, quotedText) {
const composerController = this.get('composer');
const { quoteState } = this;
const quotedText = Quote.build(post, quoteState.buffer);
quotedText = quotedText || Quote.build(post, quoteState.buffer);
quoteState.clear();
var options;