diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 276b8816..7a8e0de2 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -47,7 +47,16 @@ class RepositoriesController < ApplicationController @entry = @repository.scm.entry(@path, @rev) show_error and return unless @entry end - @changesets = @repository.changesets_for_path(@path) + @repository.changesets_with_path @path do + @changeset_count = @repository.changesets.count + @changeset_pages = Paginator.new self, @changeset_count, + 25, + params['page'] + @changesets = @repository.changesets.find(:all, + :limit => @changeset_pages.items_per_page, + :offset => @changeset_pages.current.offset) + end + render :action => "revisions", :layout => false if request.xhr? end def entry diff --git a/app/models/repository.rb b/app/models/repository.rb index 465c4ba6..8f12ccc4 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -36,6 +36,15 @@ class Repository < ActiveRecord::Base super if root_url.blank? end + def changesets_with_path(path="") + 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 + yield + end + end + def changesets_for_path(path="") path = "/#{path}%" path = url.gsub(/^#{root_url}/, '') + path if root_url && root_url != url diff --git a/app/views/repositories/revisions.rhtml b/app/views/repositories/revisions.rhtml index 52564472..b438201c 100644 --- a/app/views/repositories/revisions.rhtml +++ b/app/views/repositories/revisions.rhtml @@ -15,7 +15,9 @@

Revisions

<%= render :partial => 'revisions', :locals => {:project => @project, :path => @path, :changesets => @changesets, :entry => @entry }%> -

<%= lwr(:label_modification, @changesets.length) %>

+ +

<%= pagination_links_full @changeset_pages %> +[ <%= @changeset_pages.current.first_item %> - <%= @changeset_pages.current.last_item %> / <%= @changeset_count %> ]

<% content_for :header_tags do %> <%= stylesheet_link_tag "scm" %>