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. --- activejob/lib/rails/generators/job/job_generator.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activejob/lib/rails') diff --git a/activejob/lib/rails/generators/job/job_generator.rb b/activejob/lib/rails/generators/job/job_generator.rb index 97c11a9ea6..7cef42bc83 100644 --- a/activejob/lib/rails/generators/job/job_generator.rb +++ b/activejob/lib/rails/generators/job/job_generator.rb @@ -28,7 +28,7 @@ module Rails # :nodoc: private def application_job_file_name @application_job_file_name ||= if mountable_engine? - "app/jobs/#{namespaced_path}/application_job.rb" + File.join("app/jobs", namespaced_path, "application_job.rb") else "app/jobs/application_job.rb" end -- cgit v1.2.3