Browse Source

Plugins cannot route wiki page sub-path (#12749).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11166 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/2.3.0
Jean-Philippe Lang 11 years ago
parent
commit
44ceb513ed
2 changed files with 5 additions and 1 deletions
  1. 1
    1
      config/routes.rb
  2. 4
    0
      test/integration/routing/wiki_test.rb

+ 1
- 1
config/routes.rb View File

@@ -157,7 +157,7 @@ RedmineApp::Application.routes.draw do
end
end
match 'wiki', :controller => 'wiki', :action => 'show', :via => :get
get 'wiki/:id/:version', :to => 'wiki#show'
get 'wiki/:id/:version', :to => 'wiki#show', :constraints => {:version => /\d+/}
delete 'wiki/:id/:version', :to => 'wiki#destroy_version'
get 'wiki/:id/:version/annotate', :to => 'wiki#annotate'
get 'wiki/:id/:version/diff', :to => 'wiki#diff'

+ 4
- 0
test/integration/routing/wiki_test.rb View File

@@ -53,6 +53,10 @@ class RoutingWikiTest < ActionController::IntegrationTest
{ :controller => 'wiki', :action => 'annotate', :project_id => '1',
:id => 'CookBook_documentation', :version => '2' }
)
# Make sure we don't route wiki page sub-uris to let plugins handle them
assert_raise(ActionController::RoutingError) do
assert_recognizes({}, {:method => 'get', :path => "/projects/1/wiki/CookBook_documentation/whatever"})
end
end

def test_wiki_misc

Loading…
Cancel
Save