kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

scm: fix revisions page "OK" button always returns 404 error (#10567) 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9299 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2012-04-02 05:09:36 +00:00
parent 3db1fa6b83
commit f0936aaf18
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config/routes.rb
View File

@ -270,6 +270,9 @@ ActionController::Routing::Routes.draw do |map|
repository_views.connect 'projects/:id/repository/:repository_id/show/*path',
:requirements => { :path => /.+/ }
repository_views.connect 'projects/:id/repository/:repository_id/revision',
:action => 'revision'
repository_views.connect 'projects/:id/repository/revisions',
:action => 'revisions'
repository_views.connect 'projects/:id/repository/revisions.:format',
@ -296,13 +299,12 @@ ActionController::Routing::Routes.draw do |map|
repository_views.connect 'projects/:id/repository/:action/*path',
:requirements => { :action => /(browse|show|entry|changes|annotate|diff)/ }
repository_views.connect 'projects/:id/repository/revision',
:action => 'revision'
repository_views.connect 'projects/:id/repository/:repository_id',
:action => 'show'
end
repositories.connect 'projects/:id/repository/revision',
:action => 'revision',
:conditions => {:method => [:get, :post]}
end
# additional routes for having the file name at the end of url

10
test/integration/routing/repositories_test.rb
View File

@ -300,6 +300,11 @@ class RoutingRepositoriesTest < ActionController::IntegrationTest
{ :controller => 'repositories', :action => 'changes', :id => 'redmine',
:path => @path_hash[:param] }
)
assert_routing(
{ :method => 'get',
:path => "/projects/redmine/repository/revision" },
{ :controller => 'repositories', :action => 'revision', :id => 'redmine' }
)
end
def test_repositories_non_revisions_path_with_repository_id
@ -339,6 +344,11 @@ class RoutingRepositoriesTest < ActionController::IntegrationTest
{ :controller => 'repositories', :action => 'changes', :id => 'redmine', :repository_id => 'foo',
:path => @path_hash[:param] }
)
assert_routing(
{ :method => 'get',
:path => "/projects/redmine/repository/foo/revision" },
{ :controller => 'repositories', :action => 'revision', :id => 'redmine', :repository_id => 'foo'}
)
end
def test_repositories_related_issues