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

Merge pull request #3420 from techAPJ/patch-2 

FEATURE: accept category_id as new-topic param to better support subcategory
This commit is contained in:
Sam 2015-05-04 10:13:06 +10:00
parent 9723b77b6d 480cea7284
commit fe34a6acbd
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -439,11 +439,8 @@ export default DiscourseController.extend({
this.set('model.title', opts.topicTitle);
}
if (opts.topicCategory) {
var category = Discourse.Category.list().findProperty('name', opts.topicCategory);
if (category && category.id) {
this.set('model.categoryId', category.id);
}
if (opts.topicCategoryId) {
this.set('model.categoryId', opts.topicCategoryId);
}
if (opts.topicBody) {

4
app/assets/javascripts/discourse/mixins/open_composer.js
View File

@ -17,12 +17,12 @@ Discourse.OpenComposer = Em.Mixin.create({
});
},
openComposerWithParams: function(controller, title, body, category) {
openComposerWithParams: function(controller, title, body, category_id) {
this.controllerFor('composer').open({
action: Discourse.Composer.CREATE_TOPIC,
topicTitle: title,
topicBody: body,
topicCategory: category,
topicCategoryId: category_id,
draftKey: controller.get('draft_key'),
draftSequence: controller.get('draft_sequence')
});

4
app/assets/javascripts/discourse/routes/application.js.es6
View File

@ -148,8 +148,8 @@ const ApplicationRoute = Discourse.Route.extend(Discourse.OpenComposer, {
this.render(w, {into: 'modal/topic-bulk-actions', outlet: 'bulkOutlet', controller: factory ? controllerName : 'topic-bulk-actions'});
},
createNewTopicViaParams: function(title, body, category) {
this.openComposerWithParams(this.controllerFor('discovery/topics'), title, body, category);
createNewTopicViaParams: function(title, body, category_id) {
this.openComposerWithParams(this.controllerFor('discovery/topics'), title, body, category_id);
}
},

2
app/assets/javascripts/discourse/routes/new-topic.js.es6
View File

@ -7,7 +7,7 @@ export default Discourse.Route.extend({
if (self.controllerFor('navigation/default').get('canCreateTopic')) {
// User can create topic
Ember.run.next(function() {
e.send('createNewTopicViaParams', transition.queryParams.title, transition.queryParams.body, transition.queryParams.category);
e.send('createNewTopicViaParams', transition.queryParams.title, transition.queryParams.body, transition.queryParams.category_id);
});
}
});