kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Make sure options[:anchor] is correct in shorthand cases

Browse source
This commit is contained in:
wycats 2010-03-16 17:28:44 -07:00
parent 0c1ac36ccb
commit 7c49b1adbb
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
actionpack/lib/action_dispatch/routing/mapper.rb
View file

@ -51,7 +51,9 @@ module ActionDispatch
options.merge!(:to => to).delete(path) if path
when using_match_shorthand?(args, options)
path = args.first
options = { :to => path.gsub("/", "#"), :as => path.gsub("/", "_") }
options = { :to => path.gsub("/", "#"),
:as => path.gsub("/", "_")
}.merge(options || {})
else
path = args.first
end
@ -301,7 +303,6 @@ module ActionDispatch
options = args.extract_options!
options = (@scope[:options] || {}).merge(options)
options[:anchor] = true unless options.key?(:anchor)
if @scope[:name_prefix] && !options[:as].blank?
options[:as] = "#{@scope[:name_prefix]}_#{options[:as]}"
@ -563,6 +564,8 @@ module ActionDispatch
def match(*args)
options = args.extract_options!
options[:anchor] = true unless options.key?(:anchor)
if args.length > 1
args.each { |path| match(path, options) }
return self