diff options
| -rw-r--r-- | lib/plugins/acts_as_searchable/lib/acts_as_searchable.rb | 4 | ||||
| -rw-r--r-- | lib/redmine/search.rb | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/plugins/acts_as_searchable/lib/acts_as_searchable.rb b/lib/plugins/acts_as_searchable/lib/acts_as_searchable.rb index 35ee265de..248077472 100644 --- a/lib/plugins/acts_as_searchable/lib/acts_as_searchable.rb +++ b/lib/plugins/acts_as_searchable/lib/acts_as_searchable.rb @@ -114,7 +114,9 @@ module Redmine where(tokens_conditions). limit(options[:limit]). uniq. - pluck(searchable_options[:date_column], :id) + pluck(searchable_options[:date_column], :id). + # converts timestamps to integers for faster sort + map {|timestamp, id| [timestamp.to_i, id]} end def search_token_match_statement(column, value='?') diff --git a/lib/redmine/search.rb b/lib/redmine/search.rb index da1d5c6f6..67f654245 100644 --- a/lib/redmine/search.rb +++ b/lib/redmine/search.rb @@ -125,8 +125,7 @@ module Redmine @scope.each do |scope| klass = scope.singularize.camelcase.constantize ranks_and_ids_in_scope = klass.search_result_ranks_and_ids(@tokens, User.current, @projects, @options) - # converts timestamps to integers for faster sort - ret += ranks_and_ids_in_scope.map {|rank, id| [scope, [rank.to_i, id]]} + ret += ranks_and_ids_in_scope.map {|rs| [scope, rs]} end # sort results, higher rank and id first ret.sort! {|a,b| b.last <=> a.last} |