From cec6b64a45a2e20fe8bbea066b40deeb01f0382d Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 9 Sep 2014 16:53:43 -0400 Subject: [PATCH] FIX: Don't show filter on user card if not in topic --- .../javascripts/discourse/controllers/user-expansion.js.es6 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/user-expansion.js.es6 b/app/assets/javascripts/discourse/controllers/user-expansion.js.es6 index a67ffca2e92..1f5dbade0c8 100644 --- a/app/assets/javascripts/discourse/controllers/user-expansion.js.es6 +++ b/app/assets/javascripts/discourse/controllers/user-expansion.js.es6 @@ -1,7 +1,7 @@ import ObjectController from 'discourse/controllers/object'; export default ObjectController.extend({ - needs: ['topic'], + needs: ['topic', 'application'], visible: false, user: null, username: null, @@ -10,8 +10,10 @@ export default ObjectController.extend({ postStream: Em.computed.alias('controllers.topic.postStream'), enoughPostsForFiltering: Em.computed.gte('participant.post_count', 2), + viewingTopic: Em.computed.match('controllers.application.currentPath', /^topic\./), + showFilter: Em.computed.and('viewingTopic', 'postStream.hasNoFilters', 'enoughPostsForFiltering'), - showFilter: Em.computed.and('postStream.hasNoFilters', 'enoughPostsForFiltering'), + // showFilter: Em.computed.and('postStream.hasNoFilters', 'enoughPostsForFiltering'), showName: Discourse.computed.propertyNotEqual('user.name', 'user.username'), hasUserFilters: Em.computed.gt('postStream.userFilters.length', 0),