aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators/erb/mailer/mailer_generator.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-02-18 19:05:07 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-02-18 19:05:07 -0200
commit39c936b7605ac90c7e9643792cfe891a2d1afbf3 (patch)
treec9d3eeaae5b9d98e6b9bf3b27add9f99e5b8a4f4 /railties/lib/rails/generators/erb/mailer/mailer_generator.rb
parent3c750c4c6c4d3c2e67865bc43a99010fa8b6c7a6 (diff)
parentaf3eb5961e55a46b011be797e71f615f20f56686 (diff)
downloadrails-39c936b7605ac90c7e9643792cfe891a2d1afbf3.tar.gz
rails-39c936b7605ac90c7e9643792cfe891a2d1afbf3.tar.bz2
rails-39c936b7605ac90c7e9643792cfe891a2d1afbf3.zip
Merge pull request #18393 from y-yagi/fix_mailer
follow up to #18074
Diffstat (limited to 'railties/lib/rails/generators/erb/mailer/mailer_generator.rb')
-rw-r--r--railties/lib/rails/generators/erb/mailer/mailer_generator.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/erb/mailer/mailer_generator.rb b/railties/lib/rails/generators/erb/mailer/mailer_generator.rb
index 7d27321610..65563aa6db 100644
--- a/railties/lib/rails/generators/erb/mailer/mailer_generator.rb
+++ b/railties/lib/rails/generators/erb/mailer/mailer_generator.rb
@@ -6,7 +6,7 @@ module Erb # :nodoc:
argument :actions, type: :array, default: [], banner: "method method"
def copy_view_files
- view_base_path = File.join("app/views", class_path, file_name)
+ view_base_path = File.join("app/views", class_path, file_name + '_mailer')
empty_directory view_base_path
if self.behavior == :invoke
@@ -31,6 +31,10 @@ module Erb # :nodoc:
def formats
[:text, :html]
end
+
+ def file_name
+ @_file_name ||= super.gsub(/\_mailer/i, '')
+ end
end
end
end