diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-12-12 20:49:31 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-12-12 20:49:31 +0000 |
| commit | 2fe806a4a49cc3fcd7c2b7fe3a385d3a46ffbfd5 (patch) | |
| tree | 82f8da72bfdc6e68c83cbecf3ffac2b5bcc9738a /app/models/changeset.rb | |
| parent | 963719042a12e7833a95396036a662237a7939a0 (diff) | |
| download | redmine-2fe806a4a49cc3fcd7c2b7fe3a385d3a46ffbfd5.tar.gz redmine-2fe806a4a49cc3fcd7c2b7fe3a385d3a46ffbfd5.zip | |
Rewrites search engine to properly paginate results (#18631).
Instead of counting and retrieving results based on their timestamps, we now load all result ids then load the appropriate results by their ids. This also brings a 2x performance improvement as we search tokens in one of the 2 queries only.
git-svn-id: http://svn.redmine.org/redmine/trunk@13739 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/changeset.rb')
| -rw-r--r-- | app/models/changeset.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/changeset.rb b/app/models/changeset.rb index 4eedae145..78a69422f 100644 --- a/app/models/changeset.rb +++ b/app/models/changeset.rb @@ -35,9 +35,9 @@ class Changeset < ActiveRecord::Base :url => Proc.new {|o| {:controller => 'repositories', :action => 'revision', :id => o.repository.project, :repository_id => o.repository.identifier_param, :rev => o.identifier}} acts_as_searchable :columns => 'comments', - :scope => preload(:repository => :project), + :preload => {:repository => :project}, :project_key => "#{Repository.table_name}.project_id", - :date_column => "#{Changeset.table_name}.committed_on" + :date_column => :committed_on acts_as_activity_provider :timestamp => "#{table_name}.committed_on", :author_key => :user_id, |