Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4405 from gdpelican/fix/intersection-pagination 

FIX: Don't join on tags unnecessarily when matching all tags
This commit is contained in:
Neil Lalonde 2016-08-24 14:45:15 -04:00 committed by GitHub
parent 7a81669c18 386b8b8498
commit 50a8eb1810
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/tags_controller.rb
View File

@ -299,7 +299,7 @@ class TagsController < ::ApplicationController
options[:no_tags] = true options[:no_tags] = true
else else
options[:tags] = tag_params options[:tags] = tag_params
options[:match_all_tags] = true if tag_params.size > 1 options[:match_all_tags] = true
end end
options options

2
lib/topic_query.rb
View File

@ -459,7 +459,6 @@ class TopicQuery
result = result.preload(:tags) result = result.preload(:tags)
if @options[:tags] && @options[:tags].size > 0 if @options[:tags] && @options[:tags].size > 0
result = result.joins(:tags)
if @options[:match_all_tags] if @options[:match_all_tags]
# ALL of the given tags: # ALL of the given tags:
@ -476,6 +475,7 @@ class TopicQuery
end end
else else
# ANY of the given tags: # ANY of the given tags:
result = result.joins(:tags)
if @options[:tags][0].is_a?(Integer) if @options[:tags][0].is_a?(Integer)
result = result.where("tags.id in (?)", @options[:tags]) result = result.where("tags.id in (?)", @options[:tags])
else else