From a98b8251a61ce4eb929c9d6d5d9b6b38b52b418c Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 8 Oct 2014 12:59:00 -0400 Subject: [PATCH] FIX: Private messages were getting the `has-category` style --- app/assets/javascripts/discourse/controllers/header.js.es6 | 5 +++++ app/assets/javascripts/discourse/templates/header.hbs | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/controllers/header.js.es6 b/app/assets/javascripts/discourse/controllers/header.js.es6 index 846b1441f7e..8e2679eedbb 100644 --- a/app/assets/javascripts/discourse/controllers/header.js.es6 +++ b/app/assets/javascripts/discourse/controllers/header.js.es6 @@ -10,6 +10,11 @@ export default DiscourseController.extend({ loginRequired: Em.computed.alias('controllers.application.loginRequired'), canSignUp: Em.computed.alias('controllers.application.canSignUp'), + hasCategory: function() { + var cat = this.get('topic.category'); + return cat && !cat.get('isUncategorizedCategory'); + }.property('topic.category'), + showPrivateMessageGlyph: function() { return !this.get('topic.is_warning') && this.get('topic.isPrivateMessage'); }.property('topic.is_warning', 'topic.isPrivateMessage'), diff --git a/app/assets/javascripts/discourse/templates/header.hbs b/app/assets/javascripts/discourse/templates/header.hbs index d7d74fb1445..9d851346b66 100644 --- a/app/assets/javascripts/discourse/templates/header.hbs +++ b/app/assets/javascripts/discourse/templates/header.hbs @@ -94,7 +94,7 @@ {{#if showExtraInfo}}
-
+
{{#if showStarButton}} {{/if}}