diff --git a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 index ade393b758c..7c356c7c820 100644 --- a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 +++ b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 @@ -122,6 +122,7 @@ var controllerOpts = { showTable: Em.computed.or('hasTopics', 'topicTrackingState.hasIncoming'), allLoaded: Em.computed.empty('more_topics_url'), latest: Discourse.computed.endWith('filter', 'latest'), + new: Discourse.computed.endWith('filter', 'new'), top: Em.computed.notEmpty('period'), yearly: Em.computed.equal('period', 'yearly'), monthly: Em.computed.equal('period', 'monthly'), diff --git a/app/assets/javascripts/discourse/controllers/topic-list-item.js.es6 b/app/assets/javascripts/discourse/controllers/topic-list-item.js.es6 index 9d4364842f2..47c9d999f28 100644 --- a/app/assets/javascripts/discourse/controllers/topic-list-item.js.es6 +++ b/app/assets/javascripts/discourse/controllers/topic-list-item.js.es6 @@ -13,6 +13,7 @@ export default Ember.ObjectController.extend({ canStar: Em.computed.alias('controllers.discovery/topics.currentUser.id'), bulkSelectEnabled: Em.computed.alias('controllers.discovery/topics.bulkSelectEnabled'), + showTopicPostBadges: Em.computed.not('controllers.discovery/topics.new'), checked: function(key, value) { var selected = this.get('controllers.discovery/topics.selected'), @@ -44,4 +45,3 @@ export default Ember.ObjectController.extend({ } } }); - diff --git a/app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars b/app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars index 72cc3d37855..58e4e7602f4 100644 --- a/app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars +++ b/app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars @@ -13,7 +13,9 @@ {{topic-status topic=this.model}} {{topic-link this}} - {{topic-post-badges unread=unread newPosts=displayNewPosts unseen=unseen url=lastUnreadUrl}} + {{#if showTopicPostBadges}} + {{topic-post-badges unread=unread newPosts=displayNewPosts unseen=unseen url=lastUnreadUrl}} + {{/if}} {{#if hasExcerpt}}