TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix empty url_for with nested modules #707

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@782 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
David Heinemeier Hansson 2005-02-24 01:38:10 +00:00
parent 74d5f6ec0c
commit b7889524bf
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
actionpack/lib/action_controller/routing.rb
View File

@ -215,8 +215,9 @@ def generate(options, request)
options = options.symbolize_keys
defaults = request.path_parameters.symbolize_keys
options = defaults if options.empty? # Get back the current url if no options was passed
expand_controller_path!(options, defaults)
if options.empty? then options = defaults.clone # Get back the current url if no options was passed
else expand_controller_path!(options, defaults) # Expand the supplied controller path.
end
defaults.delete_if {|k, v| options.key?(k) && options[k].nil?} # Remove defaults that have been manually cleared using :name => nil
failures = []

5
actionpack/test/controller/routing_tests.rb
View File

@ -474,6 +474,11 @@ def test_default_dropped_with_nil_option
@request.path_parameters = {:controller => 'content', :action => 'action', :id => '10'}
verify_generate 'content/action', {:id => nil}
end
def test_url_to_self
@request.path_parameters = {:controller => 'admin/users', :action => 'index'}
verify_generate 'admin/users', {}
end
end
#require '../assertions/action_pack_assertions.rb'