From 085546df456139b6c5d2cde964133e93a0818571 Mon Sep 17 00:00:00 2001 From: Fumiaki MATSUSHIMA Date: Thu, 22 Dec 2016 19:21:11 +0900 Subject: Fix generator command for nested (namespaced) rails engine If we create nested (namespaced) rails engine such like bukkits-admin, `bin/rails g scaffold User name:string age:integer` will create `bukkits-admin/app/controllers/bukkits/users_controller.rb` but it should create `bukkits-admin/app/controllers/bukkits/admin/users_controller.rb`. In #6643, we changed `namespaced_path` as root path because we supposed application_controller is always in root but nested rails engine's application_controller will not. --- actionmailer/lib/rails/generators/mailer/mailer_generator.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionmailer/lib/rails/generators') diff --git a/actionmailer/lib/rails/generators/mailer/mailer_generator.rb b/actionmailer/lib/rails/generators/mailer/mailer_generator.rb index 4a8d0178de..519480e881 100644 --- a/actionmailer/lib/rails/generators/mailer/mailer_generator.rb +++ b/actionmailer/lib/rails/generators/mailer/mailer_generator.rb @@ -26,7 +26,7 @@ module Rails def application_mailer_file_name @_application_mailer_file_name ||= if mountable_engine? - "app/mailers/#{namespaced_path}/application_mailer.rb" + File.join("app/mailers", namespaced_path, "application_mailer.rb") else "app/mailers/application_mailer.rb" end -- cgit v1.2.3