From 8cc6cd933a529b5b133e06d6db7adecee6e3484d Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 6 Dec 2013 13:53:19 -0500
Subject: [PATCH] Don't allow filtering by user in summary mode and vice versa.
 It's just confusing.

---
 app/assets/javascripts/discourse/models/post_stream.js | 3 +++
 test/javascripts/models/post_stream_test.js            | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/models/post_stream.js b/app/assets/javascripts/discourse/models/post_stream.js
index 0ce0af09145..1d5fd5fb5fa 100644
--- a/app/assets/javascripts/discourse/models/post_stream.js
+++ b/app/assets/javascripts/discourse/models/post_stream.js
@@ -194,6 +194,8 @@ Discourse.PostStream = Em.Object.extend({
     @returns {Ember.Deferred} a promise that resolves when the summary stream has loaded.
   **/
   toggleSummary: function() {
+    var userFilters = this.get('userFilters');
+    userFilters.clear();
     this.toggleProperty('summary');
     return this.refresh();
   },
@@ -206,6 +208,7 @@ Discourse.PostStream = Em.Object.extend({
   **/
   toggleParticipant: function(username) {
     var userFilters = this.get('userFilters');
+    this.set('summary', false);
     if (userFilters.contains(username)) {
       userFilters.remove(username);
     } else {
diff --git a/test/javascripts/models/post_stream_test.js b/test/javascripts/models/post_stream_test.js
index ed2fca8763a..f6b1221d292 100644
--- a/test/javascripts/models/post_stream_test.js
+++ b/test/javascripts/models/post_stream_test.js
@@ -148,7 +148,6 @@ test("streamFilters", function() {
 
   postStream.toggleParticipant(participant.username);
   deepEqual(postStream.get('streamFilters'), {
-    filter: "summary",
     username_filters: ['eviltrout']
   }, "streamFilters contains the username we filtered");
 });