diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2014-11-25 01:59:43 +0300 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2014-11-25 01:59:43 +0300 |
| commit | 35362fc2263d4d7784de172cb5f97eb2541fb65a (patch) | |
| tree | e81260a3a7d9bea35fc091515162e307efc1893f /actionmailer | |
| parent | 9685080a7677abfa5d288a81c3e078368c6bb67c (diff) | |
| parent | a58da25d90962a39ad916fc4de22a0a0c81ba034 (diff) | |
| download | rails-35362fc2263d4d7784de172cb5f97eb2541fb65a.tar.gz rails-35362fc2263d4d7784de172cb5f97eb2541fb65a.tar.bz2 rails-35362fc2263d4d7784de172cb5f97eb2541fb65a.zip | |
Merge pull request #17646 from andyjeffries/html_layout_fix
Creating mailer layouts by default, including html and body tags
Diffstat (limited to 'actionmailer')
3 files changed, 6 insertions, 2 deletions
diff --git a/actionmailer/lib/rails/generators/mailer/mailer_generator.rb b/actionmailer/lib/rails/generators/mailer/mailer_generator.rb index d5bf864595..094ec85114 100644 --- a/actionmailer/lib/rails/generators/mailer/mailer_generator.rb +++ b/actionmailer/lib/rails/generators/mailer/mailer_generator.rb @@ -8,6 +8,7 @@ module Rails def create_mailer_file template "mailer.rb", File.join('app/mailers', class_path, "#{file_name}.rb") + template "application_mailer.rb", 'app/mailers/application_mailer.rb' end hook_for :template_engine, :test_framework diff --git a/actionmailer/lib/rails/generators/mailer/templates/application_mailer.rb b/actionmailer/lib/rails/generators/mailer/templates/application_mailer.rb new file mode 100644 index 0000000000..d25d8892dd --- /dev/null +++ b/actionmailer/lib/rails/generators/mailer/templates/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: "from@example.com" + layout 'mailer' +end diff --git a/actionmailer/lib/rails/generators/mailer/templates/mailer.rb b/actionmailer/lib/rails/generators/mailer/templates/mailer.rb index edcfb4233d..bce64a5e6e 100644 --- a/actionmailer/lib/rails/generators/mailer/templates/mailer.rb +++ b/actionmailer/lib/rails/generators/mailer/templates/mailer.rb @@ -1,6 +1,5 @@ <% module_namespacing do -%> -class <%= class_name %> < ActionMailer::Base - default from: "from@example.com" +class <%= class_name %> < ApplicationMailer <% actions.each do |action| -%> # Subject can be set in your I18n file at config/locales/en.yml |