github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-27 19:25:44 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: save drafts of new topics with titles but no body

Browse Source
This commit is contained in:
Neil Lalonde 2017-11-30 15:15:50 -05:00
parent dfd309c64f
commit bca90381cf
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/controllers/composer.js.es6
View File

@ -740,7 +740,7 @@ export default Ember.Controller.extend({
}, },
shrink() { shrink() {
if (this.get('model.replyDirty')) { if (this.get('model.replyDirty') || (this.get('model.canEditTitle') && this.get('model.titleDirty'))) {
this.collapse(); this.collapse();
} else { } else {
this.close(); this.close();

29
app/assets/javascripts/discourse/models/composer.js.es6
View File

@ -275,6 +275,16 @@ const Composer = RestModel.extend({
return this.get('reply') !== this.get('originalText'); return this.get('reply') !== this.get('originalText');
}.property('reply', 'originalText'), }.property('reply', 'originalText'),
/**
Did the user make changes to the topic title?
@property titleDirty
**/
@computed('title', 'originalTitle')
titleDirty(title, originalTitle) {
return title !== originalTitle;
},
/** /**
Number of missing characters in the title until valid. Number of missing characters in the title until valid.
@ -519,6 +529,9 @@ const Composer = RestModel.extend({
} }
if (opts.title) { this.set('title', opts.title); } if (opts.title) { this.set('title', opts.title); }
this.set('originalText', opts.draft ? '' : this.get('reply')); this.set('originalText', opts.draft ? '' : this.get('reply'));
if (this.get('editingFirstPost')) {
this.set('originalTitle', this.get('title'));
}
return false; return false;
}, },
@ -741,10 +754,18 @@ const Composer = RestModel.extend({
saveDraft() { saveDraft() {
// Do not save when drafts are disabled // Do not save when drafts are disabled
if (this.get('disableDrafts')) return; if (this.get('disableDrafts')) return;
// Do not save when there is no reply
if (!this.get('reply')) return; if (this.get('canEditTitle')) {
// Do not save when the reply's length is too small // Save title and/or post body
if (this.get('replyLength') < this.siteSettings.min_post_length) return; if (!this.get('title') && !this.get('reply')) return;
if (this.get('title') && this.get('titleLengthValid') &&
this.get('reply') && this.get('replyLength') < this.siteSettings.min_post_length) return;
} else {
// Do not save when there is no reply
if (!this.get('reply')) return;
// Do not save when the reply's length is too small
if (this.get('replyLength') < this.siteSettings.min_post_length) return;
}
const data = { const data = {
reply: this.get('reply'), reply: this.get('reply'),