diff options
| author | Eric Davis <edavis@littlestreamsoftware.com> | 2010-10-20 21:26:30 +0000 |
|---|---|---|
| committer | Eric Davis <edavis@littlestreamsoftware.com> | 2010-10-20 21:26:30 +0000 |
| commit | d3381fb518d79f815407ffc70d27cbda4208fc9e (patch) | |
| tree | 13c9cc725cd01b96e5cdc018e53be568b17b7860 /config | |
| parent | c058bc224549c82faa4771673a2126ebfe19ccf3 (diff) | |
| download | redmine-d3381fb518d79f815407ffc70d27cbda4208fc9e.tar.gz redmine-d3381fb518d79f815407ffc70d27cbda4208fc9e.zip | |
Refactor: change :id on WikiController to use :project_id
Using :id to track projects on non-project controllers is confusing and
makes routing with resources difficult.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4265 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes.rb | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/config/routes.rb b/config/routes.rb index 7bfb5b621..764d540c8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -29,18 +29,18 @@ ActionController::Routing::Routes.draw do |map| map.connect 'projects/:id/wiki/destroy', :controller => 'wikis', :action => 'destroy', :conditions => {:method => :post} map.with_options :controller => 'wiki' do |wiki_routes| wiki_routes.with_options :conditions => {:method => :get} do |wiki_views| - wiki_views.connect 'projects/:id/wiki/export', :action => 'export' - wiki_views.connect 'projects/:id/wiki/page_index', :action => 'page_index' - wiki_views.connect 'projects/:id/wiki/date_index', :action => 'date_index' - wiki_views.connect 'projects/:id/wiki/:page', :action => 'index', :page => nil - wiki_views.connect 'projects/:id/wiki/:page/edit', :action => 'edit' - wiki_views.connect 'projects/:id/wiki/:page/rename', :action => 'rename' - wiki_views.connect 'projects/:id/wiki/:page/history', :action => 'history' - wiki_views.connect 'projects/:id/wiki/:page/diff/:version/vs/:version_from', :action => 'diff' - wiki_views.connect 'projects/:id/wiki/:page/annotate/:version', :action => 'annotate' + wiki_views.connect 'projects/:project_id/wiki/export', :action => 'export' + wiki_views.connect 'projects/:project_id/wiki/page_index', :action => 'page_index' + wiki_views.connect 'projects/:project_id/wiki/date_index', :action => 'date_index' + wiki_views.connect 'projects/:project_id/wiki/:page', :action => 'index', :page => nil + wiki_views.connect 'projects/:project_id/wiki/:page/edit', :action => 'edit' + wiki_views.connect 'projects/:project_id/wiki/:page/rename', :action => 'rename' + wiki_views.connect 'projects/:project_id/wiki/:page/history', :action => 'history' + wiki_views.connect 'projects/:project_id/wiki/:page/diff/:version/vs/:version_from', :action => 'diff' + wiki_views.connect 'projects/:project_id/wiki/:page/annotate/:version', :action => 'annotate' end - wiki_routes.connect 'projects/:id/wiki/:page/:action', + wiki_routes.connect 'projects/:project_id/wiki/:page/:action', :action => /edit|rename|destroy|preview|protect/, :conditions => {:method => :post} end |