kotovalexarian-likes-github
/
rails--rails
mirror of https://github.com/rails/rails.git
1
0
Fork 0
Code Releases Activity

Rename router internal option :namespace to :controller_namespace which is its real purpose.

This commit is contained in:
José Valim 2010-02-17 18:43:24 +01:00
parent d0454e5766
commit 7189e3c881
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
actionpack/lib/action_dispatch/routing/mapper.rb
View File

@ -283,7 +283,7 @@ module ActionDispatch
end
def namespace(path)
scope(path.to_s, :name_prefix => path.to_s, :namespace => path.to_s) { yield }
scope(path.to_s, :name_prefix => path.to_s, :controller_namespace => path.to_s) { yield }
end
def constraints(constraints = {})
@ -318,12 +318,12 @@ module ActionDispatch
parent ? "#{parent}_#{child}" : child
end
def merge_namespace_scope(parent, child)
def merge_controller_namespace_scope(parent, child)
parent ? "#{parent}/#{child}" : child
end
def merge_controller_scope(parent, child)
@scope[:namespace] ? "#{@scope[:namespace]}/#{child}" : child
@scope[:controller_namespace] ? "#{@scope[:controller_namespace]}/#{child}" : child
end
def merge_resources_path_names_scope(parent, child)