meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 15:01:14 +00:00
Code Issues Releases Wiki Activity

remove empty lines with trailing white spaces at lib/redmine/search.rb

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@16941 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2017-08-01 04:46:00 +00:00
parent 09e55e3e3a
commit 7ab8bee653
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/redmine/search.rb
View File

@ -82,13 +82,11 @@ module Redmine
# Returns the results for the given offset and limit # Returns the results for the given offset and limit
def results(offset, limit) def results(offset, limit)
result_ids_to_load = result_ids[offset, limit] || [] result_ids_to_load = result_ids[offset, limit] || []
results_by_scope = Hash.new {|h,k| h[k] = []} results_by_scope = Hash.new {|h,k| h[k] = []}
result_ids_to_load.group_by(&:first).each do |scope, scope_and_ids| result_ids_to_load.group_by(&:first).each do |scope, scope_and_ids|
klass = scope.singularize.camelcase.constantize klass = scope.singularize.camelcase.constantize
results_by_scope[scope] += klass.search_results_from_ids(scope_and_ids.map(&:last)) results_by_scope[scope] += klass.search_results_from_ids(scope_and_ids.map(&:last))
end end
result_ids_to_load.map do |scope, id| result_ids_to_load.map do |scope, id|
results_by_scope[scope].detect {|record| record.id == id} results_by_scope[scope].detect {|record| record.id == id}
end.compact end.compact
@ -110,7 +108,6 @@ module Redmine
cache_key = ActiveSupport::Cache.expand_cache_key( cache_key = ActiveSupport::Cache.expand_cache_key(
[@question, @user.id, @scope.sort, @options, project_ids.sort] [@question, @user.id, @scope.sort, @options, project_ids.sort]
) )
Redmine::Search.cache_store.fetch(cache_key, :force => !@cache) do Redmine::Search.cache_store.fetch(cache_key, :force => !@cache) do
load_result_ids load_result_ids
end end