diff options
| author | Andrew White <andyw@pixeltrix.co.uk> | 2010-08-19 14:42:14 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-08-19 15:05:33 -0300 |
| commit | 0cc483aa14d79b2d07fdc71dbd935d1af8361d71 (patch) | |
| tree | 19839927ba72b9b0aacba0fadd91cf3607ac6383 /actionpack/lib/action_dispatch/routing | |
| parent | 2e455429427a4078d2888cc39305f951bdf1e643 (diff) | |
| download | rails-0cc483aa14d79b2d07fdc71dbd935d1af8361d71.tar.gz rails-0cc483aa14d79b2d07fdc71dbd935d1af8361d71.tar.bz2 rails-0cc483aa14d79b2d07fdc71dbd935d1af8361d71.zip | |
Move edit route before show route so that it will have precedence if the :id parameter allows slashes [#5409 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'actionpack/lib/action_dispatch/routing')
| -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 c6bbfdb441..26ca2ca818 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -586,10 +586,10 @@ module ActionDispatch end if parent_resource.actions.include?(:new) member_scope do + get :edit if parent_resource.actions.include?(:edit) get :show if parent_resource.actions.include?(:show) put :update if parent_resource.actions.include?(:update) delete :destroy if parent_resource.actions.include?(:destroy) - get :edit if parent_resource.actions.include?(:edit) end end @@ -616,10 +616,10 @@ module ActionDispatch end if parent_resource.actions.include?(:new) member_scope do + get :edit if parent_resource.actions.include?(:edit) get :show if parent_resource.actions.include?(:show) put :update if parent_resource.actions.include?(:update) delete :destroy if parent_resource.actions.include?(:destroy) - get :edit if parent_resource.actions.include?(:edit) end end |