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

FIX: i resolved that merge conflict badly. category notification settings dropdown was never showing.

This commit is contained in:
Neil Lalonde 2014-05-29 20:04:34 -04:00
parent 12add6ea55
commit d5b48c1ec2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/routes/discovery_route_builders.js
View File

@ -107,8 +107,8 @@ function buildCategoryRoute(filter, params) {
var opts = { category: model, filterMode: filterMode }; var opts = { category: model, filterMode: filterMode };
opts.noSubcategories = params && params.no_subcategories; opts.noSubcategories = params && params.no_subcategories;
opts.canEditCategory = Discourse.User.currentProp('staff'); opts.canEditCategory = Discourse.User.currentProp('staff');
this.controllerFor('navigation/category').setProperties(opts);
opts.canChangeCategoryNotificationLevel = Discourse.User.current(); opts.canChangeCategoryNotificationLevel = Discourse.User.current();
this.controllerFor('navigation/category').setProperties(opts);
return Discourse.TopicList.list(listFilter, params).then(function(list) { return Discourse.TopicList.list(listFilter, params).then(function(list) {
var tracking = Discourse.TopicTrackingState.current(); var tracking = Discourse.TopicTrackingState.current();