jro_apps/redmine Commit - r378:e951209d6824

added pagination on revisions list...

Jean-Philippe Lang -

r378:e951209d6824

parent child

Context file:

r378:e951209d6824

Collapse all files

app/controllers/repositories_controller.rb +10 -1

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require 'SVG/Graph/Bar'
             require 'SVG/Graph/BarHorizontal'
             class RepositoriesController < ApplicationController
               layout 'base'
               before_filter :find_project
               before_filter :authorize, :except => [:stats, :graph]
               before_filter :check_project_privacy, :only => [:stats, :graph]
               def show
                 # get entries for the browse frame
                 @entries = @repository.scm.entries('')
                 show_error and return unless @entries
                 # check if new revisions have been committed in the repository
                 scm_latestrev = @entries.revisions.latest
                 if Setting.autofetch_changesets? && scm_latestrev && ((@repository.latest_changeset.nil?) || (@repository.latest_changeset.revision < scm_latestrev.identifier.to_i))
                   @repository.fetch_changesets
                   @repository.reload
                 end
                 @changesets = @repository.changesets.find(:all, :limit => 5, :order => "committed_on DESC")
               end
               def browse
                 @entries = @repository.scm.entries(@path, @rev)
                 show_error and return unless @entries
               end
               def revisions
                 unless @path == ''
                   @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,
+,
+              								      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
                 if 'raw' == params[:format]
                   content = @repository.scm.cat(@path, @rev)
                   show_error and return unless content
                   send_data content, :filename => @path.split('/').last
                 end
               end
               def revision
                 @changeset = @repository.changesets.find_by_revision(@rev)
                 show_error and return unless @changeset
               end
               def diff
                 @rev_to = params[:rev_to] || (@rev-1)
                 @diff = @repository.scm.diff(params[:path], @rev, @rev_to)
                 show_error and return unless @diff
               end
               def stats
               end
               def graph
                 data = nil
                 case params[:graph]
                 when "commits_per_month"
                   data = graph_commits_per_month(@repository)
                 when "commits_per_author"
                   data = graph_commits_per_author(@repository)
                 end
                 if data
                   headers["Content-Type"] = "image/svg+xml"
                   send_data(data, :type => "image/svg+xml", :disposition => "inline")
                 else
                   render_404
                 end
               end
             private
               def find_project
                 @project = Project.find(params[:id])
                 @repository = @project.repository
                 render_404 and return false unless @repository
                 @path = params[:path].squeeze('/').gsub(/^\//, '') if params[:path]
                 @path ||= ''
                 @rev = params[:rev].to_i if params[:rev] and params[:rev].to_i > 0
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def show_error
                 flash.now[:notice] = l(:notice_scm_error)
                 render :nothing => true, :layout => true
               end
               def graph_commits_per_month(repository)
                 @date_to = Date.today
                 @date_from = @date_to << 12
                 commits_by_day = repository.changesets.count(:all, :group => :commit_date, :conditions => ["commit_date BETWEEN ? AND ?", @date_from, @date_to])
                 commits_by_month = [0] * 12
                 commits_by_day.each {|c| commits_by_month[c.first.to_date.months_ago] += c.last }
                 changes_by_day = repository.changes.count(:all, :group => :commit_date)
                 changes_by_month = [0] * 12
                 changes_by_day.each {|c| changes_by_month[c.first.to_date.months_ago] += c.last }
                 fields = []
                 month_names = l(:actionview_datehelper_select_month_names_abbr).split(',')
 .times {|m| fields << month_names[((Date.today.month - 1 - m) % 12)]}
                 graph = SVG::Graph::Bar.new(
                   :height => 300,
                   :width => 500,
                   :fields => fields.reverse,
                   :stack => :side,
                   :scale_integers => true,
                   :step_x_labels => 2,
                   :show_data_values => false,
                   :graph_title => l(:label_commits_per_month),
                   :show_graph_title => true
                 )
                 graph.add_data(
                   :data => commits_by_month[0..11].reverse,
                   :title => l(:label_revision_plural)
                 )
                 graph.add_data(
                   :data => changes_by_month[0..11].reverse,
                   :title => l(:label_change_plural)
                 )
                 graph.burn
               end
               def graph_commits_per_author(repository)
                 commits_by_author = repository.changesets.count(:all, :group => :committer)
                 commits_by_author.sort! {|x, y| x.last <=> y.last}
                 fields = commits_by_author.collect {|r| r.first}
                 data = commits_by_author.collect {|r| r.last}
                 fields = fields + [""]*(10 - fields.length) if fields.length<10
                 data = data + [0]*(10 - data.length) if data.length<10
                 graph = SVG::Graph::BarHorizontal.new(
                   :height => 300,
                   :width => 500,
                   :fields => fields,
                   :stack => :side,
                   :scale_integers => true,
                   :show_data_values => false,
                   :rotate_y_labels => false,
                   :graph_title => l(:label_commits_per_author),
                   :show_graph_title => true
                 )
                 graph.add_data(
                   :data => data,
                   :title => l(:label_revision_plural)
                 )
                 graph.burn
               end
             end
             class Date
               def months_ago(date = Date.today)
                 (date.year - self.year)*12 + (date.month - self.month)
               end
               def weeks_ago(date = Date.today)
                 (date.year - self.year)*52 + (date.cweek - self.cweek)
               end
             end

app/models/repository.rb +9 0

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Repository < ActiveRecord::Base
               belongs_to :project
               has_many :changesets, :dependent => :destroy, :order => 'revision DESC'
               has_many :changes, :through => :changesets
               has_one  :latest_changeset, :class_name => 'Changeset', :foreign_key => :repository_id, :order => 'revision DESC'
               attr_protected :root_url
               validates_presence_of :url
               validates_format_of :url, :with => /^(http|https|svn|file):\/\/.+/i
               def scm
                 @scm ||= SvnRepos::Base.new url, root_url, login, password
                 update_attribute(:root_url, @scm.root_url) if root_url.blank?
                 @scm
               end
               def url=(str)
                 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
                 path.squeeze!("/")
                 changesets.find(:all, :include => :changes,
                                       :conditions => ["#{Change.table_name}.path LIKE ?", path])
               end
               def fetch_changesets
                 scm_info = scm.info
                 if scm_info
                   lastrev_identifier = scm_info.lastrev.identifier.to_i
                   if latest_changeset.nil? || latest_changeset.revision < lastrev_identifier
                     logger.debug "Fetching changesets for repository #{url}" if logger && logger.debug?
                     identifier_from = latest_changeset ? latest_changeset.revision + 1 : 1
                     while (identifier_from <= lastrev_identifier)
                       # loads changesets by batches of 200
                       identifier_to = [identifier_from + 199, lastrev_identifier].min
                       revisions = scm.revisions('', identifier_to, identifier_from, :with_paths => true)
                       transaction do
                         revisions.reverse_each do |revision|
                           changeset = Changeset.create(:repository => self,
                                                        :revision => revision.identifier,
                                                        :committer => revision.author,
                                                        :committed_on => revision.time,
                                                        :comment => revision.message)
                           revision.paths.each do |change|
                             Change.create(:changeset => changeset,
                                           :action => change[:action],
                                           :path => change[:path],
                                           :from_path => change[:from_path],
                                           :from_revision => change[:from_revision])
                           end
                         end
                       end
                       identifier_from = identifier_to + 1
                     end
                   end
                 end
               end
               # fetch new changesets for all repositories
               # can be called periodically by an external script
               # eg. ruby script/runner "Repository.fetch_changesets"
               def self.fetch_changesets
                 find(:all).each(&:fetch_changesets)
               end
             end

app/views/repositories/revisions.rhtml +3 -1

             <div class="contextual">
             <% form_tag do %>
             <p><%= l(:label_revision) %>: <%= text_field_tag 'rev', @rev, :size => 5 %>
             <%= submit_tag 'OK' %></p>
             <% end %>
             </div>
             <h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => (@entry ? @entry.kind : nil), :revision => @rev } %></h2>
             <% if @entry && @entry.is_file? %>
             <h3><%=h @entry.name %></h3>
             <p><%= link_to 'Download', {:action => 'entry', :id => @project, :path => @path, :rev => @rev, :format => 'raw' }, :class => "icon file" %> (<%= number_to_human_size @entry.size %>)</p>
             <% end %>
             <h3>Revisions</h3>
             <%= render :partial => 'revisions', :locals => {:project => @project, :path => @path, :changesets => @changesets, :entry => @entry }%>
-            <p><%= lwr(:label_modification, @changesets.length) %></p>
+            <p><%= pagination_links_full @changeset_pages %>
+            [ <%= @changeset_pages.current.first_item %> - <%= @changeset_pages.current.last_item %> / <%= @changeset_count %> ]</p>
             <% content_for :header_tags do %>
             <%= stylesheet_link_tag "scm" %>
             <% end %>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages