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

FIX: adds support for new filter syntax

This commit is contained in:
Joffrey JAFFEUX 2019-05-01 22:24:09 +02:00
parent 2918f4a012
commit 9f27caf39c
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plugin.rb
View File

@ -292,8 +292,21 @@ SQL
if Report.respond_to?(:add_report) if Report.respond_to?(:add_report)
Report.add_report("accepted_solutions") do |report| Report.add_report("accepted_solutions") do |report|
report.data = [] report.data = []
accepted_solutions = TopicCustomField.where(name: "accepted_answer_post_id") accepted_solutions = TopicCustomField.where(name: "accepted_answer_post_id")
accepted_solutions = accepted_solutions.joins(:topic).where("topics.category_id = ?", report.category_id) if report.category_id
if report.respond_to?(:add_filter)
category_filter = report.filters.dig(:category)
report.add_filter('category', default: category_filter)
if category_filter
accepted_solutions = accepted_solutions.joins(:topic).where("topics.category_id = ?", category_filter)
end
else
if report.category_id
accepted_solutions = accepted_solutions.joins(:topic).where("topics.category_id = ?", report.category_id)
end
end
accepted_solutions.where("topic_custom_fields.created_at >= ?", report.start_date) accepted_solutions.where("topic_custom_fields.created_at >= ?", report.start_date)
.where("topic_custom_fields.created_at <= ?", report.end_date) .where("topic_custom_fields.created_at <= ?", report.end_date)
.group("DATE(topic_custom_fields.created_at)") .group("DATE(topic_custom_fields.created_at)")