jro_apps/redmine Commit - r867:d46e3a501e7b

Pretty URL for the repository browser (Cyril Mougel)...

Jean-Philippe Lang -

r867:d46e3a501e7b

parent child

Context file:

r867:d46e3a501e7b

Collapse all files

app/controllers/repositories_controller.rb +2 -2

              # 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'
              require 'digest/sha1'
              class RepositoriesController < ApplicationController
                layout 'base'
                before_filter :find_repository, :except => :edit
                before_filter :find_project, :only => :edit
                before_filter :authorize
                accept_key_auth :revisions
                def edit
                  @repository = @project.repository
                  if !@repository
                    @repository = Repository.factory(params[:repository_scm])
                    @repository.project = @project
                  end
                  if request.post?
                    @repository.attributes = params[:repository]
                    @repository.save
                  end
                  render(:update) {|page| page.replace_html "tab-content-repository", :partial => 'projects/settings/repository'}
                end
                def destroy
                  @repository.destroy
                  redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'repository'
                end
                def show
                  # check if new revisions have been committed in the repository
                  @repository.fetch_changesets if Setting.autofetch_changesets?
                  # get entries for the browse frame
                  @entries = @repository.entries('')
                  # latest changesets
                  @changesets = @repository.changesets.find(:all, :limit => 10, :order => "committed_on DESC")
                  show_error and return unless @entries || @changesets.any?
                end
                def browse
                  @entries = @repository.entries(@path, @rev)
                  if request.xhr?
                    @entries ? render(:partial => 'dir_list_content') : render(:nothing => true)
                  else
                    show_error unless @entries
                  end
                end
                def changes
                  @entry = @repository.scm.entry(@path, @rev)
                  show_error and return unless @entry
                  @changesets = @repository.changesets_for_path(@path)
                end
                def revisions
                  @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)
                  respond_to do |format|
                    format.html { render :layout => false if request.xhr? }
                    format.atom { render_feed(@changesets, :title => "#{@project.name}: #{l(:label_revision_plural)}") }
                  end
                end
                def entry
                  @content = @repository.scm.cat(@path, @rev)
                  show_error and return unless @content
                  if 'raw' == params[:format]
                    send_data @content, :filename => @path.split('/').last
                  end
                end
                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
                  @rev_to = params[:rev_to] ? params[:rev_to].to_i : (@rev - 1)
                  @diff_type = ('sbs' == params[:type]) ? 'sbs' : 'inline'
                  @cache_key = "repositories/diff/#{@repository.id}/" + Digest::MD5.hexdigest("#{@path}-#{@rev}-#{@rev_to}-#{@diff_type}")
                  unless read_fragment(@cache_key)
-                   @diff = @repository.diff(@path, @rev, @rev_to, type)
+                   @diff = @repository.diff(@path, @rev, @rev_to, @diff_type)
                    show_error and return unless @diff
                  end
                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])
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                def find_repository
                  @project = Project.find(params[:id])
                  @repository = @project.repository
                  render_404 and return false unless @repository
-                 @path = params[:path].squeeze('/') if params[:path]
+                 @path = params[:path].join('/') unless params[:path].nil?
                  @path ||= ''
                  @rev = params[:rev].to_i if params[:rev]
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                def show_error
                  flash.now[:error] = l(:notice_scm_error)
                  render :nothing => true, :layout => true
                end
                def graph_commits_per_month(repository)
                  @date_to = Date.today
                  @date_from = @date_to << 11
                  @date_from = Date.civil(@date_from.year, @date_from.month, 1)
                  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, :conditions => ["commit_date BETWEEN ? AND ?", @date_from, @date_to])
                  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}
                  changes_by_author = repository.changes.count(:all, :group => :committer)
                  h = changes_by_author.inject({}) {|o, i| o[i.first] = i.last; o}
                  fields = commits_by_author.collect {|r| r.first}
                  commits_data = commits_by_author.collect {|r| r.last}
                  changes_data = commits_by_author.collect {|r| h[r.first] || 0}
                  fields = fields + [""]*(10 - fields.length) if fields.length<10
                  commits_data = commits_data + [0]*(10 - commits_data.length) if commits_data.length<10
                  changes_data = changes_data + [0]*(10 - changes_data.length) if changes_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 => commits_data,
                    :title => l(:label_revision_plural)
                  )
                  graph.add_data(
                    :data => changes_data,
                    :title => l(:label_change_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
              class String
                def with_leading_slash
                  starts_with?('/') ? self : "/#{self}"
                end
              end

app/views/repositories/_revisions.rhtml +1 -2

-             <% form_tag({:controller => 'repositories', :action => 'diff', :id => @project}, :method => :get) do %>
+             <% form_tag({:controller => 'repositories', :action => 'diff', :id => @project, :path => path}, :method => :get) do %>
              <table class="list">
              <thead><tr>
              <th>#</th>
              <th></th>
              <th></th>
              <th><%= l(:label_date) %></th>
              <th><%= l(:field_author) %></th>
              <th><%= l(:field_comments) %></th>
              </tr></thead>
              <tbody>
              <% show_diff = entry && entry.is_file? && revisions.size > 1 %>
              <% line_num = 1 %>
              <% revisions.each do |changeset| %>
              <tr class="<%= cycle 'odd', 'even' %>">
              <td class="id"><%= link_to changeset.revision, :action => 'revision', :id => project, :rev => changeset.revision %></th>
              <td class="checkbox"><%= radio_button_tag('rev', changeset.revision, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") if show_diff && (line_num < revisions.size) %></td>
              <td class="checkbox"><%= radio_button_tag('rev_to', changeset.revision, (line_num==2), :id => "cbto-#{line_num}", :onclick => "if ($('cb-#{line_num}').checked==true) {$('cb-#{line_num-1}').checked=true;}") if show_diff && (line_num > 1) %></td>
              <td align="center" style="width:15%"><%= format_time(changeset.committed_on) %></td>
              <td align="center" style="width:15%"><em><%=h changeset.committer %></em></td>
              <td align="left"><%= textilizable(changeset.comments) %></td>
              </tr>
              <% line_num += 1 %>
              <% end %>
              </tbody>
              </table>
-             <%= hidden_field_tag 'path', path %>
              <%= submit_tag(l(:label_view_diff), :class => 'small', :name => nil) if show_diff %>
              <% end %>

config/routes.rb +7 0

              ActionController::Routing::Routes.draw do |map|
                # Add your own custom routes here.
                # The priority is based upon order of creation: first created -> highest priority.
                # Here's a sample route:
                # map.connect 'products/:id', :controller => 'catalog', :action => 'view'
                # Keep in mind you can assign values other than :controller and :action
                map.home '', :controller => 'welcome'
                map.connect 'wiki/:id/:page/:action', :controller => 'wiki', :page => nil
                map.connect 'roles/workflow/:id/:role_id/:tracker_id', :controller => 'roles', :action => 'workflow'
                map.connect 'help/:ctrl/:page', :controller => 'help'
                #map.connect ':controller/:action/:id/:sort_key/:sort_order'
                map.connect 'issues/:issue_id/relations/:action/:id', :controller => 'issue_relations'
                map.connect 'projects/:project_id/boards/:action/:id', :controller => 'boards'
                map.connect 'boards/:board_id/topics/:action/:id', :controller => 'messages'
+               map.with_options :controller => 'repositories' do |omap|
+                 omap.repositories_show 'repositories/browse/:id/*path', :action => 'browse'
+                 omap.repositories_changes 'repositories/changes/:id/*path', :action => 'changes'
+                 omap.repositories_diff 'repositories/diff/:id/*path', :action => 'diff'
+                 omap.repositories_entry 'repositories/entry/:id/*path', :action => 'entry'
+               end
                # Allow downloading Web Service WSDL as a file with an extension
                # instead of a file named 'wsdl'
                map.connect ':controller/service.wsdl', :action => 'wsdl'
                # Install the default route as the lowest priority.
                map.connect ':controller/:action/:id'
              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