github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-26 20:25:36 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: not searching group messages when searching private

Browse Source
This commit is contained in:
Sam Saffron 2015-12-15 13:26:35 +11:00
parent 33181c7152
commit 4be8de21a1
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/search.rb
View File

@ -442,7 +442,15 @@ class Search
if @search_context.is_a?(User) if @search_context.is_a?(User)
if opts[:private_messages] if opts[:private_messages]
posts = posts.where("topics.id IN (SELECT topic_id FROM topic_allowed_users WHERE user_id = ?)", @search_context.id) posts = posts.where("topics.id IN (SELECT topic_id
FROM topic_allowed_users
WHERE user_id = :user_id
UNION ALL
SELECT tg.topic_id
FROM topic_allowed_groups tg
JOIN group_users gu ON gu.user_id = :user_id AND
gu.group_id = tg.group_id)",
user_id: @search_context.id)
else else
posts = posts.where("posts.user_id = #{@search_context.id}") posts = posts.where("posts.user_id = #{@search_context.id}")
end end