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

app/controllers/repositories_controller.rb +2 -2

                 @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
                 @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

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>
             <% 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

               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'

General Comments 0

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

No TODOs yet

	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