FIX: When uncategorized badge is not suppressed, the header formatting

was a bit messed up
2014-10-23 12:07:29 -04:00 · 2014-10-23 12:07:29 -04:00 · d734bdabb6
parent 0041081c6e
commit d734bdabb6
1 changed files with 3 additions and 1 deletions
--- a/app/assets/javascripts/discourse/controllers/header.js.es6
+++ b/app/assets/javascripts/discourse/controllers/header.js.es6
@ -12,7 +12,9 @@ export default DiscourseController.extend({

  hasCategory: function() {
    var cat = this.get('topic.category');
-    return cat && !cat.get('isUncategorizedCategory');
+    return cat &&
+           !cat.get('isUncategorizedCategory') ||
+           !this.siteSettings.suppress_uncategorized_badge;
  }.property('topic.category'),

  showPrivateMessageGlyph: function() {