diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2018-11-19 19:23:44 -0500 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2018-11-19 19:23:44 -0500 |
| commit | 72062c8c9d32237d1eb7d3eb3318f65042383408 (patch) | |
| tree | 7168d4225215f2a2df61e31b45e92258fc11f8db /actionmailer/lib | |
| parent | 4aad2e2228b2127680e6b5aaba5c0cf0e09b1467 (diff) | |
| parent | 5c54db290f4e7cdd69b461d4c0b020a9cd364537 (diff) | |
| download | rails-72062c8c9d32237d1eb7d3eb3318f65042383408.tar.gz rails-72062c8c9d32237d1eb7d3eb3318f65042383408.tar.bz2 rails-72062c8c9d32237d1eb7d3eb3318f65042383408.zip | |
Merge pull request #22534 from evopark/master
ActionMailer: support overriding template name in multipart
Diffstat (limited to 'actionmailer/lib')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 509d859ac3..2bb1078bb8 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -942,9 +942,7 @@ module ActionMailer def collect_responses(headers) if block_given? - collector = ActionMailer::Collector.new(lookup_context) { render(action_name) } - yield(collector) - collector.responses + collect_responses_from_block(headers, &Proc.new) elsif headers[:body] collect_responses_from_text(headers) else @@ -952,6 +950,13 @@ module ActionMailer end end + def collect_responses_from_block(headers) + templates_name = headers[:template_name] || action_name + collector = ActionMailer::Collector.new(lookup_context) { render(templates_name) } + yield(collector) + collector.responses + end + def collect_responses_from_text(headers) [{ body: headers.delete(:body), |