Browse Source

backout r10707 (#12196)

fix "Page not found" on OK button in SCM "View all revisions" page.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10708 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/2.2.0
Toshi MARUYAMA 11 years ago
parent
commit
2beae77c58
2 changed files with 12 additions and 19 deletions
  1. 2
    5
      config/routes.rb
  2. 10
    14
      test/integration/routing/repositories_test.rb

+ 2
- 5
config/routes.rb View File

@@ -221,9 +221,7 @@ RedmineApp::Application.routes.draw do
:to => 'repositories#changes'

get 'projects/:id/repository/:repository_id/revisions/:rev', :to => 'repositories#revision'
match 'projects/:id/repository/:repository_id/revision',
:to => 'repositories#revision',
:via => [:get, :post]
get 'projects/:id/repository/:repository_id/revision', :to => 'repositories#revision'
post 'projects/:id/repository/:repository_id/revisions/:rev/issues', :to => 'repositories#add_related_issue'
delete 'projects/:id/repository/:repository_id/revisions/:rev/issues/:issue_id', :to => 'repositories#remove_related_issue'
get 'projects/:id/repository/:repository_id/revisions', :to => 'repositories#revisions'
@@ -243,8 +241,7 @@ RedmineApp::Application.routes.draw do

get 'projects/:id/repository/revisions', :to => 'repositories#revisions'
get 'projects/:id/repository/revisions/:rev', :to => 'repositories#revision'
match 'projects/:id/repository/revision', :to => 'repositories#revision',
:via => [:get, :post]
get 'projects/:id/repository/revision', :to => 'repositories#revision'
post 'projects/:id/repository/revisions/:rev/issues', :to => 'repositories#add_related_issue'
delete 'projects/:id/repository/revisions/:rev/issues/:issue_id', :to => 'repositories#remove_related_issue'
get 'projects/:id/repository/revisions/:rev/:action(/*path(.:ext))',

+ 10
- 14
test/integration/routing/repositories_test.rb View File

@@ -321,13 +321,11 @@ class RoutingRepositoriesTest < ActionController::IntegrationTest
{ :controller => 'repositories', :action => 'changes', :id => 'redmine',
:path => @path_hash[:param] }
)
["get", "post"].each do |method|
assert_routing(
{ :method => method,
:path => "/projects/redmine/repository/revision" },
{ :controller => 'repositories', :action => 'revision', :id => 'redmine' }
)
end
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
@@ -394,13 +392,11 @@ class RoutingRepositoriesTest < ActionController::IntegrationTest
{ :controller => 'repositories', :action => 'changes', :id => 'redmine', :repository_id => 'foo',
:path => @path_hash[:param] }
)
["get", "post"].each do |method|
assert_routing(
{ :method => method,
:path => "/projects/redmine/repository/foo/revision" },
{ :controller => 'repositories', :action => 'revision', :id => 'redmine', :repository_id => 'foo'}
)
end
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

Loading…
Cancel
Save