make sure to merge the original responder options into the given options to preserve location

This commit is contained in:
Tony Pitale
2013-03-15 03:54:35 -04:00
parent 6408b73e3c
commit d3c6596990
2 changed files with 10 additions and 1 deletions

View File

@@ -32,7 +32,7 @@ module ActiveModel
serialization_scope = controller.send(:serialization_scope)
options[:scope] = serialization_scope unless options.has_key?(:scope)
options[:url_options] = controller.send(:url_options)
render(given_options.merge(:json => serializer.new(resource, options)))
render(given_options.merge(self.options).merge(:json => serializer.new(resource, options)))
else
super
end