diff options
author | Grant Hutchins <nertzy@gmail.com> | 2012-03-28 20:05:26 -0400 |
---|---|---|
committer | Grant Hutchins <nertzy@gmail.com> | 2012-03-28 20:21:46 -0400 |
commit | 18d275ada1b23bf07cc51a815385afac6bb2b8cb (patch) | |
tree | becc415730a060480e027c2ef4fabfb33df84b51 /actionpack/lib/action_view/renderer/partial_renderer.rb | |
parent | a0e83d5af7385317fdcc91390e1b3a02b0cf56b8 (diff) | |
download | rails-18d275ada1b23bf07cc51a815385afac6bb2b8cb.tar.gz rails-18d275ada1b23bf07cc51a815385afac6bb2b8cb.tar.bz2 rails-18d275ada1b23bf07cc51a815385afac6bb2b8cb.zip |
Make controller namespace partial prefix optional
config.action_view.prefix_partial_path_with_controller_namespace
This allows you to choose to render @post using
/posts/_post.erb instead of /admin/posts/_post.erb
inside Admin::PostsController.
Diffstat (limited to 'actionpack/lib/action_view/renderer/partial_renderer.rb')
-rw-r--r-- | actionpack/lib/action_view/renderer/partial_renderer.rb | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/renderer/partial_renderer.rb b/actionpack/lib/action_view/renderer/partial_renderer.rb index d4c652c0d1..8b53867aea 100644 --- a/actionpack/lib/action_view/renderer/partial_renderer.rb +++ b/actionpack/lib/action_view/renderer/partial_renderer.rb @@ -245,12 +245,11 @@ module ActionView # <%- end -%> # <% end %> class PartialRenderer < AbstractRenderer - PARTIAL_NAMES = Hash.new { |h,k| h[k] = {} } + PREFIXED_PARTIAL_NAMES = Hash.new { |h,k| h[k] = {} } def initialize(*) super @context_prefix = @lookup_context.prefixes.first - @partial_names = PARTIAL_NAMES[@context_prefix] end def render(context, options, block) @@ -423,7 +422,15 @@ module ActionView raise ArgumentError.new("'#{object.inspect}' is not an ActiveModel-compatible object. It must implement :to_partial_path.") end - @partial_names[path] ||= merge_prefix_into_object_path(@context_prefix, path.dup) + if @view.prefix_partial_path_with_controller_namespace + prefixed_partial_names[path] ||= merge_prefix_into_object_path(@context_prefix, path.dup) + else + path + end + end + + def prefixed_partial_names + @prefixed_partial_names ||= PREFIXED_PARTIAL_NAMES[@context_prefix] end def merge_prefix_into_object_path(prefix, object_path) |