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

diff --git a/config/routes.rb b/config/routes.rb
index 034b0ddd2d7bc8e97fc2a155585832e898628fa0..300e4ffd4462c07531febd617ae8192b0e949a28 100644 (file)
--- 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'