Routes cleanup.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10980 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/config/routes.rb b/config/routes.rb
index f66250ee1031d1425226509bfca6188b0559054d..7b048d57013f739c2a5b0481b64f86a729866e61 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -85,11 +85,9 @@ RedmineApp::Application.routes.draw do
   match 'watchers/unwatch', :controller=> 'watchers', :action => 'unwatch', :via => :post
   match 'watchers/autocomplete_for_user', :controller=> 'watchers', :action => 'autocomplete_for_user', :via => :get
 
-  get 'projects/:id/settings/:tab', :to => "projects#settings"
-
   resources :projects do
     member do
-      get 'settings'
+      get 'settings(/:tab)', :action => 'settings', :as => 'settings'
       post 'modules'
       post 'archive'
       post 'unarchive'
@@ -206,9 +204,6 @@ RedmineApp::Application.routes.draw do
   # TODO: delete /time_entries for bulk deletion
   match '/time_entries/destroy', :to => 'timelog#destroy', :via => :delete
 
-  # TODO: port to be part of the resources route(s)
-  match 'projects/:id/settings/:tab', :to => 'projects#settings', :via => :get
-
   get 'projects/:id/activity', :to => 'activities#index'
   get 'projects/:id/activity.:format', :to => 'activities#index'
   get 'activity', :to => 'activities#index'