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

Merge pull request #42 from davidtaylorhq/filter_parameters 

Check discourse version before adding TopicQuery filters
This commit is contained in:
Sam 2017-02-27 16:24:56 -05:00 committed by GitHub
parent e7e96f0e3f e3cf14016f
commit 5ce9f8319a
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
plugin.rb
View File

@ -337,25 +337,27 @@ SQL
end end
end end
require_dependency 'topic_query' if Discourse.has_needed_version?(Discourse::VERSION::STRING, '1.8.0.beta6')
require_dependency 'topic_query'
TopicQuery.add_custom_filter(:solved) do |results, topic_query| TopicQuery.add_custom_filter(:solved) do |results, topic_query|
if topic_query.options[:solved] == 'true' if topic_query.options[:solved] == 'true'
results = results.where("topics.id IN ( results = results.where("topics.id IN (
SELECT tc.topic_id SELECT tc.topic_id
FROM topic_custom_fields tc FROM topic_custom_fields tc
WHERE tc.name = 'accepted_answer_post_id' AND WHERE tc.name = 'accepted_answer_post_id' AND
tc.value IS NOT NULL tc.value IS NOT NULL
)") )")
elsif topic_query.options[:solved] == 'false' elsif topic_query.options[:solved] == 'false'
results = results.where("topics.id NOT IN ( results = results.where("topics.id NOT IN (
SELECT tc.topic_id SELECT tc.topic_id
FROM topic_custom_fields tc FROM topic_custom_fields tc
WHERE tc.name = 'accepted_answer_post_id' AND WHERE tc.name = 'accepted_answer_post_id' AND
tc.value IS NOT NULL tc.value IS NOT NULL
)") )")
end
results
end end
results
end end
require_dependency 'topic_list_item_serializer' require_dependency 'topic_list_item_serializer'