github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-30 07:11:34 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: do not show PM topics when moving posts to an existing public topic (#6876)

Browse Source
This commit is contained in:
Arpit Jalan
2019-01-14 15:00:45 +05:30
committed by GitHub
parent 78748f1501
commit a121d40771
5 changed files with 49 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/search.rb
View File

@ -227,7 +227,7 @@ class Search
end
# If the term is a number or url to a topic, just include that topic
if @opts[:search_for_id] && @results.type_filter == 'topic'
if @opts[:search_for_id] && (@results.type_filter == 'topic' || @results.type_filter == 'private_messages')
if @term =~ /^\d+$/
single_topic(@term.to_i)
else
@ -629,7 +629,14 @@ class Search
# If we're searching for a single topic
def single_topic(id)
post = Post.find_by(topic_id: id, post_number: 1)
if @opts[:restrict_to_archetype].present?
archetype = @opts[:restrict_to_archetype] == Archetype.default ? Archetype.default : Archetype.private_message
post = Post.joins(:topic)
.where("topics.id = :id AND topics.archetype = :archetype AND posts.post_number = 1", id: id, archetype: archetype)
.first
else
post = Post.find_by(topic_id: id, post_number: 1)
end
return nil unless @guardian.can_see?(post)
@results.add(post)