0
@@ -681,7 +681,7 @@ module ActionController #:nodoc:
0
- def render_action(action_name, status = nil, with_layout = true)
0
+ def render_action(action_name, status = nil, with_layout = true)
#:nodoc:0
template = default_template_name(action_name.to_s)
0
if with_layout && !template_exempt_from_layout?(template)
0
render_with_layout(template, status)
0
@@ -690,69 +690,68 @@ module ActionController #:nodoc:
0
- def render_file(template_path, status = nil, use_full_path = false, locals = {})
0
+ def render_file(template_path, status = nil, use_full_path = false, locals = {})
#:nodoc:0
add_variables_to_assigns
0
assert_existence_of_template_file(template_path) if use_full_path
0
logger.info("Rendering #{template_path}" + (status ? " (#{status})" : '')) if logger
0
render_text(@template.render_file(template_path, use_full_path, locals), status)
0
- def render_template(template, status = nil, type = :rhtml, local_assigns = {})
0
+ def render_template(template, status = nil, type = :rhtml, local_assigns = {})
#:nodoc:0
add_variables_to_assigns
0
render_text(@template.render_template(type, template, nil, local_assigns), status)
0
- def render_text(text = nil, status = nil)
0
+ def render_text(text = nil, status = nil)
#:nodoc:0
@performed_render = true
0
@response.headers['Status'] = (status || DEFAULT_RENDER_STATUS_CODE).to_s
0
- def render_javascript(javascript, status = nil)
0
+ def render_javascript(javascript, status = nil)
#:nodoc:0
@response.headers['Content-Type'] = 'text/javascript; charset=UTF-8'
0
render_text(javascript, status)
0
- def render_xml(xml, status = nil)
0
+ def render_xml(xml, status = nil)
#:nodoc:0
@response.headers['Content-Type'] = 'application/xml'
0
render_text(xml, status)
0
- def render_nothing(status = nil)
0
+ def render_nothing(status = nil)
#:nodoc:0
render_text(' ', status)
0
- def render_partial(partial_path = default_template_name, object = nil, local_assigns = nil, status = nil)
0
+ def render_partial(partial_path = default_template_name, object = nil, local_assigns = nil, status = nil)
#:nodoc:0
add_variables_to_assigns
0
render_text(@template.render_partial(partial_path, object, local_assigns), status)
0
- def render_partial_collection(partial_name, collection, partial_spacer_template = nil, local_assigns = nil, status = nil)
0
+ def render_partial_collection(partial_name, collection, partial_spacer_template = nil, local_assigns = nil, status = nil)
#:nodoc:0
add_variables_to_assigns
0
render_text(@template.render_partial_collection(partial_name, collection, partial_spacer_template, local_assigns), status)
0
- def render_with_layout(template_name = default_template_name, status = nil, layout = nil)
0
+ def render_with_layout(template_name = default_template_name, status = nil, layout = nil)
#:nodoc:0
render_with_a_layout(template_name, status, layout)
0
- def render_without_layout(template_name = default_template_name, status = nil)
0
+ def render_without_layout(template_name = default_template_name, status = nil)
#:nodoc:0
render_with_no_layout(template_name, status)
0
# Clears the rendered results, allowing for another render to be performed.
0
- def erase_render_results
0
+ def erase_render_results
#:nodoc:0
@performed_render = false
0
# Clears the redirected results from the headers, resets the status to 200 and returns
0
# the URL that was used to redirect or nil if there was no redirected URL
0
# Note that +redirect_to+ will change the body of the response to indicate a redirection.
0
# The response body is not reset here, see +erase_render_results+
0
- def erase_redirect_results
0
+ def erase_redirect_results
#:nodoc:0
@performed_redirect = false
0
response.redirected_to = nil
0
response.redirected_to_method_params = nil
0
@@ -761,12 +760,12 @@ module ActionController #:nodoc:
0
# Erase both render and redirect results
0
+ def erase_results
#:nodoc:0
- def rewrite_options(options)
0
+ def rewrite_options(options)
#:nodoc:0
if defaults = default_url_options(options)
0
defaults.merge(options)
Comments
No one has commented yet.