From a870d06c0a752927892bd47201e13a2471593a9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Wed, 22 Feb 2012 16:03:24 -0200 Subject: Fix routes inspection order --- actionpack/lib/action_dispatch/routing/mapper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'actionpack/lib') diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index bb0441c100..f66d28bf83 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -1014,10 +1014,10 @@ module ActionDispatch member do get :edit if parent_resource.actions.include?(:edit) get :show if parent_resource.actions.include?(:show) - delete :destroy if parent_resource.actions.include?(:destroy) if parent_resource.actions.include?(:update) send default_method_for_update, :update end + delete :destroy if parent_resource.actions.include?(:destroy) end end @@ -1156,10 +1156,10 @@ module ActionDispatch member do get :edit if parent_resource.actions.include?(:edit) get :show if parent_resource.actions.include?(:show) - delete :destroy if parent_resource.actions.include?(:destroy) if parent_resource.actions.include?(:update) send default_method_for_update, :update end + delete :destroy if parent_resource.actions.include?(:destroy) end end -- cgit v1.2.3