Ensure render :file works inside templates
This commit is contained in:
parent
2e0765a003
commit
1dbfe9766e
|
@ -530,7 +530,7 @@ module ActionMailer #:nodoc:
|
|||
end
|
||||
|
||||
def render_message(method_name, body)
|
||||
render :file => method_name, :body => body
|
||||
render :file => method_name, :body => body, :use_full_path => true
|
||||
end
|
||||
|
||||
def render(opts)
|
||||
|
@ -538,6 +538,7 @@ module ActionMailer #:nodoc:
|
|||
if opts[:file] && opts[:file] !~ /\//
|
||||
opts[:file] = "#{mailer_name}/#{opts[:file]}"
|
||||
end
|
||||
opts[:use_full_path] = true
|
||||
initialize_template_class(body).render(opts)
|
||||
end
|
||||
|
||||
|
|
|
@ -253,6 +253,7 @@ If you are rendering a subtemplate, you must now use controller-like partial syn
|
|||
elsif options == :update
|
||||
update_page(&block)
|
||||
elsif options.is_a?(Hash)
|
||||
use_full_path = options[:use_full_path]
|
||||
options = options.reverse_merge(:locals => {}, :use_full_path => true)
|
||||
|
||||
if partial_layout = options.delete(:layout)
|
||||
|
@ -266,7 +267,7 @@ If you are rendering a subtemplate, you must now use controller-like partial syn
|
|||
end
|
||||
end
|
||||
elsif options[:file]
|
||||
render_file(options[:file], options[:use_full_path], options[:locals])
|
||||
render_file(options[:file], use_full_path || false, options[:locals])
|
||||
elsif options[:partial] && options[:collection]
|
||||
render_partial_collection(options[:partial], options[:collection], options[:spacer_template], options[:locals])
|
||||
elsif options[:partial]
|
||||
|
|
|
@ -68,6 +68,11 @@ class NewRenderTestController < ActionController::Base
|
|||
path = File.join(File.dirname(__FILE__), '../fixtures/test/render_file_with_ivar.erb')
|
||||
render :file => path
|
||||
end
|
||||
|
||||
def render_file_from_template
|
||||
@secret = 'in the sauce'
|
||||
@path = File.expand_path(File.join(File.dirname(__FILE__), '../fixtures/test/render_file_with_ivar.erb'))
|
||||
end
|
||||
|
||||
def render_file_with_locals
|
||||
path = File.join(File.dirname(__FILE__), '../fixtures/test/render_file_with_locals.erb')
|
||||
|
@ -531,6 +536,11 @@ class NewRenderTest < Test::Unit::TestCase
|
|||
get :render_file_with_locals
|
||||
assert_equal "The secret is in the sauce\n", @response.body
|
||||
end
|
||||
|
||||
def test_render_file_from_template
|
||||
get :render_file_from_template
|
||||
assert_equal "The secret is in the sauce\n", @response.body
|
||||
end
|
||||
|
||||
def test_attempt_to_access_object_method
|
||||
assert_raises(ActionController::UnknownAction, "No action responded to [clone]") { get :clone }
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
<%= render :file => @path %>
|
Loading…
Reference in New Issue