replace _render_*_from_controller with render_* as they are intended to be public
This commit is contained in:
parent
7f717abb0e
commit
f0945409d9
|
@ -23,7 +23,7 @@ class Kaigi < ActionController::Http
|
|||
|
||||
DEFAULT_LAYOUT = Object.new.tap {|l| def l.render(*) yield end }
|
||||
|
||||
def _render_template_from_controller(template, layout = DEFAULT_LAYOUT, options = {}, partial = false)
|
||||
def render_template(template, layout = DEFAULT_LAYOUT, options = {}, partial = false)
|
||||
ret = template.render(self, {})
|
||||
layout.render(self, {}) { ret }
|
||||
end
|
||||
|
|
|
@ -19,11 +19,11 @@ module AbstractController
|
|||
# The view class must have the following methods:
|
||||
# View.for_controller[controller] Create a new ActionView instance for a
|
||||
# controller
|
||||
# View#_render_partial_from_controller[options]
|
||||
# View#render_partial[options]
|
||||
# - responsible for setting options[:_template]
|
||||
# - Returns String with the rendered partial
|
||||
# options<Hash>:: see _render_partial in ActionView::Base
|
||||
# View#_render_template_from_controller[template, layout, options, partial]
|
||||
# View#render_template[template, layout, options, partial]
|
||||
# - Returns String with the rendered template
|
||||
# template<ActionView::Template>:: The template to render
|
||||
# layout<ActionView::Template>:: The layout to render around the template
|
||||
|
@ -55,7 +55,7 @@ module AbstractController
|
|||
def render_to_body(options = {})
|
||||
# TODO: Refactor so we can just use the normal template logic for this
|
||||
if options[:_partial_object]
|
||||
_action_view._render_partial_from_controller(options)
|
||||
_action_view.render_partial(options)
|
||||
else
|
||||
_determine_template(options)
|
||||
_render_template(options)
|
||||
|
@ -77,7 +77,7 @@ module AbstractController
|
|||
# _layout<ActionView::Template>:: The layout to wrap the template in (optional)
|
||||
# _partial<TrueClass, FalseClass>:: Whether or not the template to be rendered is a partial
|
||||
def _render_template(options)
|
||||
_action_view._render_template_from_controller(options[:_template], options[:_layout], options, options[:_partial])
|
||||
_action_view.render_template(options[:_template], options[:_layout], options, options[:_partial])
|
||||
end
|
||||
|
||||
# The list of view paths for this controller. See ActionView::ViewPathSet for
|
||||
|
|
|
@ -12,11 +12,11 @@ module ActionView
|
|||
#
|
||||
# Context.for_controller[controller] Create a new ActionView instance for a
|
||||
# controller
|
||||
# Context#_render_partial_from_controller[options]
|
||||
# Context#render_partial[options]
|
||||
# - responsible for setting options[:_template]
|
||||
# - Returns String with the rendered partial
|
||||
# options<Hash>:: see _render_partial in ActionView::Base
|
||||
# Context#_render_template_from_controller[template, layout, options, partial]
|
||||
# Context#render_template[template, layout, options, partial]
|
||||
# - Returns String with the rendered template
|
||||
# template<ActionView::Template>:: The template to render
|
||||
# layout<ActionView::Template>:: The layout to render around the template
|
||||
|
|
|
@ -177,7 +177,7 @@ module ActionView
|
|||
attr_accessor :_partial
|
||||
end
|
||||
|
||||
def _render_partial_from_controller(*args)
|
||||
def render_partial(*args)
|
||||
@assigns_added = false
|
||||
_render_partial(*args)
|
||||
end
|
||||
|
|
|
@ -123,7 +123,7 @@ module ActionView
|
|||
layout ? _render_content_with_layout(text, layout, options[:locals]) : text
|
||||
end
|
||||
|
||||
def _render_template_from_controller(*args)
|
||||
def render_template(*args)
|
||||
@assigns_added = nil
|
||||
_render_template_with_layout(*args)
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue