Discource-C/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-23 22:21:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #185 from tms/search-all-the-things

Browse Source 
Search all the things
This commit is contained in:
Sam 2013-02-17 13:53:58 -08:00
commit c7fba796b6
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/views/search/search_view.js.coffee
View File

@ -92,8 +92,8 @@ window.Discourse.SearchView = Ember.View.extend Discourse.Presence,
count
).property('content')
moreOfType: (e) ->
@set('typeFilter', e.context)
moreOfType: (type) ->
@set('typeFilter', type)
false
cancelType: ->

7
lib/search.rb
View File

@ -100,7 +100,7 @@ module Search
db_result = []
[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
end
end
@ -157,9 +157,12 @@ module Search
end
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,
name: I18n.t("search.types.#{type}"),
more: type_filter.blank? && (results.size == Search.per_facet),
more: more,
results: results}
end
result