diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-01-11 17:42:31 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-01-11 17:42:31 +0000 |
| commit | 44ceb513ed1707eef2d3f66d4639207df5585e1f (patch) | |
| tree | e2d2c86cbe7bcde3dde2cadb5c86183ffc8693f2 | |
| parent | 3716a5c62f71b8fa70f92b4bc88775fab8e642ae (diff) | |
| download | redmine-44ceb513ed1707eef2d3f66d4639207df5585e1f.tar.gz redmine-44ceb513ed1707eef2d3f66d4639207df5585e1f.zip | |
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
| -rw-r--r-- | config/routes.rb | 2 | ||||
| -rw-r--r-- | test/integration/routing/wiki_test.rb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb index 72445cc72..228e8bf60 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -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' diff --git a/test/integration/routing/wiki_test.rb b/test/integration/routing/wiki_test.rb index 5deeb7ee1..b153b095b 100644 --- a/test/integration/routing/wiki_test.rb +++ b/test/integration/routing/wiki_test.rb @@ -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 |