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

BUGFIX: could not save user's preferences when categories where watched/tracked/muted

This commit is contained in:
Régis Hanol 2014-01-14 20:30:35 +01:00
parent 92cb52e76e
commit 8e5b736caa
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/discourse/components/category_group_component.js
View File

@ -15,10 +15,14 @@ Discourse.CategoryGroupComponent = Ember.Component.extend({
});
},
onChangeItems: function(items) {
self.set("categories", items);
var categories = _.map(items, function(link) {
var slug = link.match(/href=['"]\/category\/([^'"]+)/)[1];
return Discourse.Category.findSingleBySlug(slug);
});
self.set("categories", categories);
},
template: Discourse.CategoryGroupComponent.templateFunction(),
transformComplete: function(category){
transformComplete: function(category) {
return Discourse.HTML.categoryLink(category, {allowUncategorized: true});
}
});

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

@ -26,7 +26,6 @@ Discourse.User = Discourse.Model.extend({
**/
staff: Em.computed.or('admin', 'moderator'),
searchContext: function() {
return {
type: 'user',