diff options
author | Nick Sutterer <apotonick@gmail.com> | 2011-05-04 00:12:11 +0200 |
---|---|---|
committer | Nick Sutterer <apotonick@gmail.com> | 2011-05-04 00:12:11 +0200 |
commit | eb327c1bab918c7d9ab723550f767529771d2e19 (patch) | |
tree | 3a3aedaec37ea8ef02b6e99f104b4f1fc2f721e7 /actionpack/lib/action_view/renderer/partial_renderer.rb | |
parent | b4bc2c50ca9887dec7cd9095a5bc84e2d6677e43 (diff) | |
download | rails-eb327c1bab918c7d9ab723550f767529771d2e19.tar.gz rails-eb327c1bab918c7d9ab723550f767529771d2e19.tar.bz2 rails-eb327c1bab918c7d9ab723550f767529771d2e19.zip |
no @controller dependency in Renderers.
Diffstat (limited to 'actionpack/lib/action_view/renderer/partial_renderer.rb')
-rw-r--r-- | actionpack/lib/action_view/renderer/partial_renderer.rb | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/actionpack/lib/action_view/renderer/partial_renderer.rb b/actionpack/lib/action_view/renderer/partial_renderer.rb index 70327b16c4..a351fbc04f 100644 --- a/actionpack/lib/action_view/renderer/partial_renderer.rb +++ b/actionpack/lib/action_view/renderer/partial_renderer.rb @@ -219,7 +219,7 @@ module ActionView def initialize(*) super - @partial_names = PARTIAL_NAMES[@controller.class.name] + @partial_names = PARTIAL_NAMES[@lookup_context.prefixes.first] end def render(context, options, block) @@ -304,10 +304,6 @@ module ActionView self end - def controller_prefixes - @controller_prefixes ||= @controller && @controller._prefixes - end - def collection if @options.key?(:collection) collection = @options[:collection] @@ -331,7 +327,7 @@ module ActionView end def find_template(path=@path, locals=@locals.keys) - prefixes = path.include?(?/) ? [] : controller_prefixes + prefixes = path.include?(?/) ? [] : @lookup_context.prefixes @lookup_context.find_template(path, prefixes, true, locals) end @@ -372,7 +368,7 @@ module ActionView object = object.to_model if object.respond_to?(:to_model) object.class.model_name.partial_path.dup.tap do |partial| - path = controller_prefixes.first + path = @lookup_context.prefixes.first partial.insert(0, "#{File.dirname(path)}/") if partial.include?(?/) && path.include?(?/) end end |