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

FIX: sloppy topic draft handling 

Will open in categories page and category drill down
This commit is contained in:
Sam 2014-08-05 11:33:15 +10:00
parent ef5b18779e
commit 1958b0205e
6 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/discourse/models/category_list.js
View File

@ -73,6 +73,7 @@ Discourse.CategoryList.reopenClass({
can_create_category: result.category_list.can_create_category,
can_create_topic: result.category_list.can_create_topic,
draft_key: result.category_list.draft_key,
draft: result.category_list.draft,
draft_sequence: result.category_list.draft_sequence
});
});

2
app/assets/javascripts/discourse/routes/build-category-route.js.es6
View File

@ -85,6 +85,8 @@ export default function(filter, params) {
this.controllerFor('search').set('searchContext', model.get('searchContext'));
this.set('topics', null);
this.openTopicDraft(topics);
},
renderTemplate: function() {

13
app/assets/javascripts/discourse/routes/build-topic-route.js.es6
View File

@ -59,18 +59,7 @@ export default function(filter) {
selected: []
});
// If there's a draft, open the create topic composer
if (model.draft) {
var composer = this.controllerFor('composer');
if (!composer.get('model.viewOpen')) {
composer.open({
action: Discourse.Composer.CREATE_TOPIC,
draft: model.draft,
draftKey: model.draft_key,
draftSequence: model.draft_sequence
});
}
}
this.openTopicDraft(model);
this.controllerFor('navigation/default').set('canCreateTopic', model.get('can_create_topic'));
},

15
app/assets/javascripts/discourse/routes/discourse_route.js
View File

@ -19,6 +19,21 @@ Discourse.Route = Em.Route.extend({
activate: function() {
this._super();
Em.run.scheduleOnce('afterRender', Discourse.Route, 'cleanDOM');
},
openTopicDraft: function(model){
// If there's a draft, open the create topic composer
if (model.draft) {
var composer = this.controllerFor('composer');
if (!composer.get('model.viewOpen')) {
composer.open({
action: Discourse.Composer.CREATE_TOPIC,
draft: model.draft,
draftKey: model.draft_key,
draftSequence: model.draft_sequence
});
}
}
}
});

3
app/assets/javascripts/discourse/routes/discovery_categories_route.js
View File

@ -38,6 +38,9 @@ Discourse.DiscoveryCategoriesRoute = Discourse.Route.extend(Discourse.OpenCompos
// Only show either the Create Category or Create Topic button
this.controllerFor('navigation/categories').set('canCreateCategory', model.get('can_create_category'));
this.controllerFor('navigation/categories').set('canCreateTopic', model.get('can_create_topic') && !model.get('can_create_category'));
this.openTopicDraft(model);
},
actions: {

10
app/assets/javascripts/discourse/routes/discovery_top_routes.js
View File

@ -21,15 +21,7 @@ Discourse.DiscoveryTopRoute = Discourse.Route.extend(Discourse.OpenComposer, {
this.controllerFor('discovery/top').setProperties({ model: model, category: null });
this.controllerFor('navigation/default').set('canCreateTopic', model.get('can_create_topic'));
// If there's a draft, open the create topic composer
if (model.draft) {
this.controllerFor('composer').open({
action: Discourse.Composer.CREATE_TOPIC,
draft: model.draft,
draftKey: model.draft_key,
draftSequence: model.draft_sequence
});
}
this.openTopicDraft(model);
},
renderTemplate: function() {