From c344f4321127b44b70c0551a377d8051e42477cd Mon Sep 17 00:00:00 2001 From: David Taylor Date: Tue, 28 Jan 2020 11:26:42 +0000 Subject: [PATCH] UX: Admins should only see their own PMs when searching in:all Admins are technically allowed to access all PMs, but it can be confusing to include them all in search. Follow-up to e0605029dc58c681e61400042763aa8a43c584c7 --- lib/search.rb | 2 +- spec/components/search_spec.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/search.rb b/lib/search.rb index 444af966725..1869c0ce453 100644 --- a/lib/search.rb +++ b/lib/search.rb @@ -828,7 +828,7 @@ class Search end elsif opts[:type_filter] === "all_topics" private_posts = posts.where("topics.archetype = ?", Archetype.private_message) - private_posts = private_posts.private_posts_for_user(@guardian.user) unless @guardian.is_admin? + private_posts = private_posts.private_posts_for_user(@guardian.user) posts = posts.where("topics.archetype <> ?", Archetype.private_message).or(private_posts) else diff --git a/spec/components/search_spec.rb b/spec/components/search_spec.rb index e337567d36e..7e5590c9893 100644 --- a/spec/components/search_spec.rb +++ b/spec/components/search_spec.rb @@ -348,11 +348,11 @@ describe Search do guardian: Guardian.new(u3)) expect(results.posts.length).to eq(1) - # Admin + # Admin doesn't see private topic results = Search.execute('spam', type_filter: 'all_topics', guardian: Guardian.new(u4)) - expect(results.posts.length).to eq(2) + expect(results.posts.length).to eq(1) # same keyword for different users results = Search.execute('ham',