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

2025-02-21 01:40:40 +08:00 · 2014-11-25 18:13:38 -05:00 · 2014-11-25 18:13:38 -05:00 · 220f2424b5
commit 220f2424b5
parent d171d6db19
2 changed files with 1 additions and 3 deletions
--- a/app/assets/javascripts/discourse/controllers/header.js.es6
+++ b/app/assets/javascripts/discourse/controllers/header.js.es6
@ -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() {
--- a/app/assets/javascripts/discourse/routes/topic-route.js.es6
+++ b/app/assets/javascripts/discourse/routes/topic-route.js.es6