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
This commit is contained in:
parent
561f7090c8
commit
dd769d2af8
|
@ -118,18 +118,18 @@ ActionController::Routing::Routes.draw do |map|
|
||||||
map.connect 'members/autocomplete_for_member/:id', :controller => 'members',
|
map.connect 'members/autocomplete_for_member/:id', :controller => 'members',
|
||||||
:action => 'autocomplete_for_member', :conditions => { :method => :post }
|
:action => 'autocomplete_for_member', :conditions => { :method => :post }
|
||||||
|
|
||||||
map.resources :users
|
|
||||||
map.with_options :controller => 'users' do |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',
|
users.user_membership 'users/:id/memberships/:membership_id',
|
||||||
:action => 'edit_membership',
|
:action => 'edit_membership',
|
||||||
:conditions => {:method => :put}
|
:conditions => {:method => :put}
|
||||||
users.connect 'users/:id/memberships/:membership_id',
|
users.connect 'users/:id/memberships/:membership_id',
|
||||||
:action => 'destroy_membership',
|
:action => 'destroy_membership',
|
||||||
:conditions => {:method => :delete}
|
:conditions => {:method => :delete}
|
||||||
|
users.user_memberships 'users/:id/memberships',
|
||||||
|
:action => 'edit_membership',
|
||||||
|
:conditions => {:method => :post}
|
||||||
end
|
end
|
||||||
|
map.resources :users
|
||||||
|
|
||||||
# For nice "roadmap" in the url for the index action
|
# For nice "roadmap" in the url for the index action
|
||||||
map.connect 'projects/:project_id/roadmap', :controller => 'versions', :action => 'index'
|
map.connect 'projects/:project_id/roadmap', :controller => 'versions', :action => 'index'
|
||||||
|
|
Loading…
Reference in New Issue