diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-02-22 16:03:24 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-02-22 16:03:24 -0200 |
| commit | a870d06c0a752927892bd47201e13a2471593a9b (patch) | |
| tree | f1784d751192703e48f1fa4312455d69b3b61c21 /actionpack/lib | |
| parent | 7f2548e34d79c47ca138ca0378f4a06390c407f1 (diff) | |
| download | rails-a870d06c0a752927892bd47201e13a2471593a9b.tar.gz rails-a870d06c0a752927892bd47201e13a2471593a9b.tar.bz2 rails-a870d06c0a752927892bd47201e13a2471593a9b.zip | |
Fix routes inspection order
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
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 |