aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/routing/mapper.rb
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2010-08-18 07:31:52 +0800
committerJosé Valim <jose.valim@gmail.com>2010-08-17 20:41:13 -0300
commitfca617af143dd8598502bdbaa617e7fe124d595e (patch)
tree88f6a9ff8de80ddcef513ed0447ff350afef062c /actionpack/lib/action_dispatch/routing/mapper.rb
parenta0ca3d1067a4e6fdee3baaff35a4547b3a1aa991 (diff)
downloadrails-fca617af143dd8598502bdbaa617e7fe124d595e.tar.gz
rails-fca617af143dd8598502bdbaa617e7fe124d595e.tar.bz2
rails-fca617af143dd8598502bdbaa617e7fe124d595e.zip
Allow member actions (get, etc) to accept strings, with test
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/mapper.rb')
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index c118c72440..c27f06c686 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -731,6 +731,7 @@ module ActionDispatch
end
elsif resource_method_scope?
path = path_for_custom_action
+ options[:action] ||= action
options[:as] = name_for_action(options[:as]) if options[:as]
args.push(options)