diff --git a/app/assets/javascripts/discourse/models/user_stream.js b/app/assets/javascripts/discourse/models/user_stream.js index 13c807f94..0dd256d18 100644 --- a/app/assets/javascripts/discourse/models/user_stream.js +++ b/app/assets/javascripts/discourse/models/user_stream.js @@ -25,8 +25,8 @@ Discourse.UserStream = Discourse.Model.extend({ } if(!filter) { - return [Discourse.UserAction.TYPES.posts, - Discourse.UserAction.TYPES.topics]; + return [ Discourse.UserAction.TYPES.topics, + Discourse.UserAction.TYPES.posts].join(","); } return filter; diff --git a/test/javascripts/models/user-stream-test.js.es6 b/test/javascripts/models/user-stream-test.js.es6 index 643160cb1..727938da4 100644 --- a/test/javascripts/models/user-stream-test.js.es6 +++ b/test/javascripts/models/user-stream-test.js.es6 @@ -18,7 +18,8 @@ test('filterParam', function() { var user = Discourse.User.create({id: 1, username: 'eviltrout'}); var stream = user.get('stream'); - blank(stream.get('filterParam'), "it's blank by default"); + // defaults to posts/topics + equal(stream.get('filterParam'), "4,5"); stream.set('filter', Discourse.UserAction.TYPES.likes_given); equal(stream.get('filterParam'), Discourse.UserAction.TYPES.likes_given);