diff options
| author | Sen-Zhang <solowolf21@126.com> | 2016-03-11 16:59:06 -0800 |
|---|---|---|
| committer | Sen-Zhang <solowolf21@126.com> | 2016-03-11 16:59:06 -0800 |
| commit | 1be95636253739b38abe1e44277da822a328bf20 (patch) | |
| tree | 045790b31f4bad6a45f1d7b37094ed6a5a2de04d /actionmailer/lib/rails | |
| parent | 0b3ae023d27197417541932632055cd6be4810c4 (diff) | |
| download | rails-1be95636253739b38abe1e44277da822a328bf20.tar.gz rails-1be95636253739b38abe1e44277da822a328bf20.tar.bz2 rails-1be95636253739b38abe1e44277da822a328bf20.zip | |
improve some code
Diffstat (limited to 'actionmailer/lib/rails')
| -rw-r--r-- | actionmailer/lib/rails/generators/mailer/mailer_generator.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/actionmailer/lib/rails/generators/mailer/mailer_generator.rb b/actionmailer/lib/rails/generators/mailer/mailer_generator.rb index 0277ecde16..f86d43be61 100644 --- a/actionmailer/lib/rails/generators/mailer/mailer_generator.rb +++ b/actionmailer/lib/rails/generators/mailer/mailer_generator.rb @@ -10,8 +10,10 @@ module Rails def create_mailer_file template "mailer.rb", File.join('app/mailers', class_path, "#{file_name}_mailer.rb") - unless File.exist?('app/mailers/application_mailer.rb') - template 'application_mailer.rb', 'app/mailers/application_mailer.rb' + in_root do + if self.behavior == :invoke && !File.exist?('app/mailers/application_mailer.rb') + template 'application_mailer.rb', 'app/mailers/application_mailer.rb' + end end end |