Fixed: performance issue on RepositoriesController#revisions when a changeset has a great number of changes (eg. 100,000).
Also added pagination for changes on changeset details view. git-svn-id: http://redmine.rubyforge.org/svn/trunk@535 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -49,7 +49,7 @@ class RepositoriesController < ApplicationController
|
||||
show_error and return unless @entry
|
||||
end
|
||||
@repository.changesets_with_path @path do
|
||||
@changeset_count = @repository.changesets.count
|
||||
@changeset_count = @repository.changesets.count(:select => "DISTINCT #{Changeset.table_name}.id")
|
||||
@changeset_pages = Paginator.new self, @changeset_count,
|
||||
25,
|
||||
params['page']
|
||||
@@ -71,6 +71,13 @@ class RepositoriesController < ApplicationController
|
||||
def revision
|
||||
@changeset = @repository.changesets.find_by_revision(@rev)
|
||||
show_error and return unless @changeset
|
||||
@changes_count = @changeset.changes.size
|
||||
@changes_pages = Paginator.new self, @changes_count, 150, params['page']
|
||||
@changes = @changeset.changes.find(:all,
|
||||
:limit => @changes_pages.items_per_page,
|
||||
:offset => @changes_pages.current.offset)
|
||||
|
||||
render :action => "revision", :layout => false if request.xhr?
|
||||
end
|
||||
|
||||
def diff
|
||||
|
||||
@@ -40,7 +40,9 @@ class Repository < ActiveRecord::Base
|
||||
path = "/#{path}%"
|
||||
path = url.gsub(/^#{root_url}/, '') + path if root_url && root_url != url
|
||||
path.squeeze!("/")
|
||||
Changeset.with_scope(:find => { :include => :changes, :conditions => ["#{Change.table_name}.path LIKE ?", path] }) do
|
||||
# Custom select and joins is done to allow conditions on changes table without loading associated Change objects
|
||||
# Required for changesets with a great number of changes (eg. 100,000)
|
||||
Changeset.with_scope(:find => { :select => "DISTINCT #{Changeset.table_name}.*", :joins => "LEFT OUTER JOIN #{Change.table_name} ON #{Change.table_name}.changeset_id = #{Changeset.table_name}.id", :conditions => ["#{Change.table_name}.path LIKE ?", path] }) do
|
||||
yield
|
||||
end
|
||||
end
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
<p><%= link_to(l(:label_view_diff), :action => 'diff', :id => @project, :path => "", :rev => @changeset.revision) if @changeset.changes.any? %></p>
|
||||
<table class="list">
|
||||
<tbody>
|
||||
<% @changeset.changes.each do |change| %>
|
||||
<% @changes.each do |change| %>
|
||||
<tr class="<%= cycle 'odd', 'even' %>">
|
||||
<td><div class="square action_<%= change.action %>"></div> <%= change.path %></td>
|
||||
<td align="right">
|
||||
@@ -40,8 +40,9 @@
|
||||
<% end %>
|
||||
</tbody>
|
||||
</table>
|
||||
<p><%= lwr(:label_modification, @changeset.changes.length) %></p>
|
||||
<p><%= pagination_links_full @changes_pages, :rev => @changeset.revision %>
|
||||
[ <%= @changes_pages.current.first_item %> - <%= @changes_pages.current.last_item %> / <%= @changes_count %> ]</p>
|
||||
|
||||
<% content_for :header_tags do %>
|
||||
<%= stylesheet_link_tag "scm" %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
||||
Reference in New Issue
Block a user