Skip to content
Browse files

Fix overwrite params. Closes #1909

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2144 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent f2a89d7 commit 3108764367023aabaee04d1dbcbed8eb76e61184 @seckar seckar committed Sep 6, 2005
View
2 actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fixed overwrite_params
+
* Added ActionController::Base.benchmark and ActionController::Base.silence to allow for easy benchmarking and turning off the log
* Updated vendor copy of html-scanner to support better xml parsing
View
4 actionpack/lib/action_controller/url_rewriter.rb
@@ -36,6 +36,10 @@ def rewrite_url(path, options)
def rewrite_path(options)
options = options.symbolize_keys
options.update(options[:params].symbolize_keys) if options[:params]
+ if (overwrite = options.delete(:overwrite_params))
+ options.update(@parameters)
+ options.update(overwrite)
+ end
RESERVED_OPTIONS.each {|k| options.delete k}
path, extra_keys = Routing::Routes.generate(options.dup, @request) # Warning: Routes will mutate and violate the options hash
View
10 actionpack/test/controller/url_rewriter_tests.rb
@@ -23,5 +23,15 @@ def test_expand_array_build_query_string
def test_escape_spaces_build_query_string_selected_keys
assert_equal '?x=hello+world', @rewriter.send(:build_query_string, {:x => 'hello world', :y => 'goodbye world'}, [:x])
end
+
+ def test_overwrite_params
+ @params[:controller] = 'hi'
+ @params[:action] = 'bye'
+ @params[:id] = '2'
+
+ assert_equal '/hi/hi/2', @rewriter.rewrite(:only_path => true, :overwrite_params => {:action => 'hi'})
+ u = @rewriter.rewrite(:only_path => false, :overwrite_params => {:action => 'hi'})
+ assert_match %r(/hi/hi/2$), u
+ end
end

0 comments on commit 3108764

Please sign in to comment.
Something went wrong with that request. Please try again.