summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-12-30 16:08:42 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-12-30 16:08:42 +0000
commitdd769d2af87a28fd25e00765c0151a99aa928ee2 (patch)
treea4d2b8db40843a0f9b0e812d6781d4b8c01c0499 /config
parent561f7090c8c93ddf3924e324b6d2e6b81c57abb8 (diff)
downloadredmine-dd769d2af87a28fd25e00765c0151a99aa928ee2.tar.gz
redmine-dd769d2af87a28fd25e00765c0151a99aa928ee2.zip
route: change order users resources and matchings
This changes pass users tests on Rails 3.0. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8442 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/config/routes.rb b/config/routes.rb
index 034b0ddd2..300e4ffd4 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -118,18 +118,18 @@ ActionController::Routing::Routes.draw do |map|
map.connect 'members/autocomplete_for_member/:id', :controller => 'members',
:action => 'autocomplete_for_member', :conditions => { :method => :post }
- map.resources :users
map.with_options :controller => 'users' do |users|
- users.user_memberships 'users/:id/memberships',
- :action => 'edit_membership',
- :conditions => {:method => :post}
users.user_membership 'users/:id/memberships/:membership_id',
:action => 'edit_membership',
:conditions => {:method => :put}
users.connect 'users/:id/memberships/:membership_id',
:action => 'destroy_membership',
:conditions => {:method => :delete}
+ users.user_memberships 'users/:id/memberships',
+ :action => 'edit_membership',
+ :conditions => {:method => :post}
end
+ map.resources :users
# For nice "roadmap" in the url for the index action
map.connect 'projects/:project_id/roadmap', :controller => 'versions', :action => 'index'