aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorGeoff Garside <geoff@geoffgarside.co.uk>2008-11-18 15:14:55 +0000
committerMichael Koziarski <michael@koziarski.com>2008-11-24 19:19:55 +0100
commiteac16d0ee1f9a46e686503196e3920e2113ccc0a (patch)
tree8f1db2eeeb8af6a682bfc19f94abd9fe9d7fbbbb /actionpack/lib/action_controller
parent8aeed003f562fe9199614d013163c89b5182cd33 (diff)
downloadrails-eac16d0ee1f9a46e686503196e3920e2113ccc0a.tar.gz
rails-eac16d0ee1f9a46e686503196e3920e2113ccc0a.tar.bz2
rails-eac16d0ee1f9a46e686503196e3920e2113ccc0a.zip
Reorder the way in which map.resource routes are added to the set. This prevents the singular named route from hitting :create instead of :show.
Signed-off-by: Michael Koziarski <michael@koziarski.com>
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/resources.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/resources.rb b/actionpack/lib/action_controller/resources.rb
index b5ea764911..c170528af1 100644
--- a/actionpack/lib/action_controller/resources.rb
+++ b/actionpack/lib/action_controller/resources.rb
@@ -535,9 +535,9 @@ module ActionController
with_options :controller => resource.controller do |map|
map_collection_actions(map, resource)
- map_default_singleton_actions(map, resource)
map_new_actions(map, resource)
map_member_actions(map, resource)
+ map_default_singleton_actions(map, resource)
map_associations(resource, options)