aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/renderer/partial_renderer.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-10-14 09:27:18 +0200
committerJosé Valim <jose.valim@gmail.com>2010-10-14 09:27:18 +0200
commit37d78028b235f04b2d3ca5cd88b7e1e0ad218684 (patch)
treed89694e106cbc3353ac1b0eeaf257ea91b3a7b01 /actionpack/lib/action_view/renderer/partial_renderer.rb
parentc7aea81a39e130bfddd26537dea5f3626e2a009e (diff)
downloadrails-37d78028b235f04b2d3ca5cd88b7e1e0ad218684.tar.gz
rails-37d78028b235f04b2d3ca5cd88b7e1e0ad218684.tar.bz2
rails-37d78028b235f04b2d3ca5cd88b7e1e0ad218684.zip
render :once should consider the current controller prefix.
Diffstat (limited to 'actionpack/lib/action_view/renderer/partial_renderer.rb')
-rw-r--r--actionpack/lib/action_view/renderer/partial_renderer.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/renderer/partial_renderer.rb b/actionpack/lib/action_view/renderer/partial_renderer.rb
index eff425687b..c580397cad 100644
--- a/actionpack/lib/action_view/renderer/partial_renderer.rb
+++ b/actionpack/lib/action_view/renderer/partial_renderer.rb
@@ -110,7 +110,7 @@ module ActionView
end
def find_template(path=@path, locals=@locals.keys)
- prefix = @view.controller_path unless path.include?(?/)
+ prefix = @view.controller_prefix unless path.include?(?/)
@lookup_context.find_template(path, prefix, true, locals)
end
@@ -151,7 +151,7 @@ module ActionView
object = object.to_model if object.respond_to?(:to_model)
object.class.model_name.partial_path.dup.tap do |partial|
- path = @view.controller_path
+ path = @view.controller_prefix
partial.insert(0, "#{File.dirname(path)}/") if partial.include?(?/) && path.include?(?/)
end
end