Pretty URL for the repository browser (Cyril Mougel)

git-svn-id: http://redmine.rubyforge.org/svn/trunk@880 e93f8b46-1217-0410-a6f0-8f06a7374b81

Pretty URL for the repository browser (Cyril Mougel)
git-svn-id: http://redmine.rubyforge.org/svn/trunk@880 e93f8b46-1217-0410-a6f0-8f06a7374b81
d46e3a50 · Jean-Philippe Lang · d4e47d5d · d46e3a50 · d46e3a50 · d46e3a50
Commit d46e3a50 authored Nov 04, 2007 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 4 deletions

repositories_controller.rb app/controllers/repositories_controller.rb +2 -2

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

routes.rb config/routes.rb +7 -0

No files found.
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -110,7 +110,7 @@ class RepositoriesController < ApplicationController
    
    @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
@@ -145,7 +145,7 @@ private
    @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

--- a/app/views/repositories/_revisions.rhtml
+++ b/app/views/repositories/_revisions.rhtml
-<% 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>
@@ -24,6 +24,5 @@
 <% end %>
 </tbody>
 </table>
-<%= hidden_field_tag 'path', path %>
 <%= submit_tag(l(:label_view_diff), :class => 'small', :name => nil) if show_diff %>
 <% end %>
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -16,6 +16,13 @@ ActionController::Routing::Routes.draw do |map|
  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'