codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-27 17:46:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIX: Load order issue / header category badge when not surpressed

Browse source
This commit is contained in:
Robin Ward 2014-11-25 18:13:38 -05:00
parent d171d6db19
commit 220f2424b5
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/discourse/controllers/header.js.es6
View file

@ -12,9 +12,7 @@ export default DiscourseController.extend({
hasCategory: function() {
var cat = this.get('topic.category');
return cat &&
!cat.get('isUncategorizedCategory') ||
!this.siteSettings.suppress_uncategorized_badge;
return cat && (!cat.get('isUncategorizedCategory') || !this.siteSettings.suppress_uncategorized_badge);
}.property('topic.category'),
showPrivateMessageGlyph: function() {

0
app/assets/javascripts/discourse/routes/topic-route.js.es6 → app/assets/javascripts/discourse/routes/topic.js.es6
View file