diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-22 12:09:32 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-22 12:09:32 -0200 |
| commit | e36ecf4d776023c2eeeda9abae818ae04539efa0 (patch) | |
| tree | aabe018bfddef6c0888dd4d6966657f80c5c0a69 /actionview/lib/action_view | |
| parent | 9d519eefbc59d7784d83a7497224d2903c7b76d3 (diff) | |
| parent | 3011b64184747f4d26e5c5ca32170be370bc0a1c (diff) | |
| download | rails-e36ecf4d776023c2eeeda9abae818ae04539efa0.tar.gz rails-e36ecf4d776023c2eeeda9abae818ae04539efa0.tar.bz2 rails-e36ecf4d776023c2eeeda9abae818ae04539efa0.zip | |
Merge pull request #18546 from brainopia/action_view_render
A shortcut to setup controller environment
Diffstat (limited to 'actionview/lib/action_view')
| -rw-r--r-- | actionview/lib/action_view/rendering.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/actionview/lib/action_view/rendering.rb b/actionview/lib/action_view/rendering.rb index abd3b77c67..1e8e7415d1 100644 --- a/actionview/lib/action_view/rendering.rb +++ b/actionview/lib/action_view/rendering.rb @@ -92,12 +92,15 @@ module ActionView # Find and render a template based on the options given. # :api: private def _render_template(options) #:nodoc: - variant = options[:variant] + variant = options.delete(:variant) + assigns = options.delete(:assigns) + context = view_context + context.assign assigns if assigns lookup_context.rendered_format = nil if options[:formats] lookup_context.variants = variant if variant - view_renderer.render(view_context, options) + view_renderer.render(context, options) end # Assign the rendered format to lookup context. |