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

Move name_prefix merging into Scoping concern

Browse source
This commit is contained in:
Joshua Peek 2009-12-07 19:50:13 -06:00
parent e600b41c7f
commit e86a82c52c
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -258,7 +258,13 @@ module ActionDispatch
def match(*args)
options = args.extract_options!
options = (@scope[:options] || {}).merge(options)
if @scope[:name_prefix]
options[:as] = "#{@scope[:name_prefix]}#{options[:as]}"
end
args.push(options)
super(*args)
end
@ -391,9 +397,7 @@ module ActionDispatch
validate_defaults!(app, defaults, segment_keys)
app = Constraints.new(app, blocks)
name = @scope[:name_prefix] ? "#{@scope[:name_prefix]}#{options[:as]}" : options[:as]
@set.add_route(app, conditions, requirements, defaults, name)
@set.add_route(app, conditions, requirements, defaults, options[:as])
self
end