mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
bfe58ac05d
* It is not possible to always pre-determine the layout before going to ActionView.
This was *already* broken for render :partial => @object, :layout => true. This is
now handled by overriding render_to_body in layouts.rb and manually injecting the
partial's response. This needs to be done in ActionController since ActionController
knows enough to get _layout_for_option. There is probably a better abstraction here.
* As a result, all partial rendering can correctly restrict their layouts to the mime
type of the rendered partial. This could have previously caused a bug in some edge cases.
* If other layout-like options are added, they might need to add special code for the
case of render :partial. We should try to think of an alternate solution, if possible,
but this works for the cases we know of now.
66 lines
2 KiB
Ruby
66 lines
2 KiB
Ruby
module ActionController
|
|
module Renderer
|
|
extend ActiveSupport::Concern
|
|
|
|
include AbstractController::Renderer
|
|
|
|
def process_action(*)
|
|
self.formats = request.formats.map {|x| x.to_sym}
|
|
super
|
|
end
|
|
|
|
def render(options)
|
|
super
|
|
self.content_type ||= begin
|
|
mime = options[:_template].mime_type
|
|
formats.include?(mime && mime.to_sym) || formats.include?(:all) ? mime : Mime::Type.lookup_by_extension(formats.first)
|
|
end.to_s
|
|
response_body
|
|
end
|
|
|
|
def render_to_body(options)
|
|
_process_options(options)
|
|
|
|
if options.key?(:partial)
|
|
options[:partial] = action_name if options[:partial] == true
|
|
options[:_details] = {:formats => formats}
|
|
end
|
|
|
|
super
|
|
end
|
|
|
|
private
|
|
def _prefix
|
|
controller_path
|
|
end
|
|
|
|
def _determine_template(options)
|
|
if options.key?(:text)
|
|
options[:_template] = ActionView::TextTemplate.new(options[:text], formats.first)
|
|
elsif options.key?(:inline)
|
|
handler = ActionView::Template.handler_class_for_extension(options[:type] || "erb")
|
|
template = ActionView::Template.new(options[:inline], "inline #{options[:inline].inspect}", handler, {})
|
|
options[:_template] = template
|
|
elsif options.key?(:template)
|
|
options[:_template_name] = options[:template]
|
|
elsif options.key?(:file)
|
|
options[:_template_name] = options[:file]
|
|
elsif !options.key?(:partial)
|
|
options[:_template_name] = (options[:action] || action_name).to_s
|
|
options[:_prefix] = _prefix
|
|
end
|
|
|
|
super
|
|
end
|
|
|
|
def _render_partial(partial, options)
|
|
end
|
|
|
|
def _process_options(options)
|
|
status, content_type, location = options.values_at(:status, :content_type, :location)
|
|
self.status = status if status
|
|
self.content_type = content_type if content_type
|
|
self.headers["Location"] = url_for(location) if location
|
|
end
|
|
end
|
|
end
|