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

Request per_facet + 1 in search to know if we actually have more

This commit is contained in:
tms 2013-02-17 02:52:21 -05:00
parent 66d56a8b93
commit eebc6c7e41
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/search.rb
View File

@ -100,7 +100,7 @@ module Search
db_result = [] db_result = []
[user_query_sql, category_query_sql, topic_query_sql].each do |sql| [user_query_sql, category_query_sql, topic_query_sql].each do |sql|
sql << " LIMIT " << Search.per_facet.to_s sql << " LIMIT " << (Search.per_facet + 1).to_s
db_result += ActiveRecord::Base.exec_sql(sql , query: terms.join(" & ")).to_a db_result += ActiveRecord::Base.exec_sql(sql , query: terms.join(" & ")).to_a
end end
end end
@ -157,9 +157,12 @@ module Search
end end
result = grouped.map do |type, results| result = grouped.map do |type, results|
more = type_filter.blank? && (results.size > Search.per_facet)
results = results[0..([results.length, Search.per_facet].min - 1)] if type_filter.blank?
{type: type, {type: type,
name: I18n.t("search.types.#{type}"), name: I18n.t("search.types.#{type}"),
more: type_filter.blank? && (results.size == Search.per_facet), more: more,
results: results} results: results}
end end
result result