github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-29 13:34:33 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: sets categoryId but do not scope when replying as new topic (#7002)

Browse Source
This commit is contained in:
Joffrey JAFFEUX 2019-02-13 15:19:58 +01:00 committed by GitHub
parent fe4254b8f3
commit 560cc4e73e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -783,7 +783,11 @@ export default Ember.Controller.extend({
}); });
// Scope the categories drop down to the category we opened the composer with. // Scope the categories drop down to the category we opened the composer with.
if (opts.categoryId && opts.draftKey !== "reply_as_new_topic") { if (
opts.categoryId &&
opts.draftKey !== "reply_as_new_topic" &&
!opts.disableScopedCategory
) {
const category = this.site.categories.findBy("id", opts.categoryId); const category = this.site.categories.findBy("id", opts.categoryId);
if (category) { if (category) {
this.set("scopedCategoryId", opts.categoryId); this.set("scopedCategoryId", opts.categoryId);

8
app/assets/javascripts/select-kit/components/composer-actions.js.es6
View File

@ -242,6 +242,7 @@ export default DropdownSelectBoxComponent.extend({
replyAsNewTopicSelected(options) { replyAsNewTopicSelected(options) {
options.action = CREATE_TOPIC; options.action = CREATE_TOPIC;
options.categoryId = this.get("composerModel.topic.category.id"); options.categoryId = this.get("composerModel.topic.category.id");
options.disableScopedCategory = true;
this._replyFromExisting(options, _postSnapshot, _topicSnapshot); this._replyFromExisting(options, _postSnapshot, _topicSnapshot);
}, },
@ -295,7 +296,12 @@ export default DropdownSelectBoxComponent.extend({
if (this[action]) { if (this[action]) {
let model = this.get("composerModel"); let model = this.get("composerModel");
this[action]( this[action](
model.getProperties("draftKey", "draftSequence", "reply"), model.getProperties(
"draftKey",
"draftSequence",
"reply",
"disableScopedCategory"
),
model model
); );
} else { } else {