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. --- .../lib/rails/generators/active_record/model/model_generator.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord') diff --git a/activerecord/lib/rails/generators/active_record/model/model_generator.rb b/activerecord/lib/rails/generators/active_record/model/model_generator.rb index 61a8d3c100..cc78fe0db5 100644 --- a/activerecord/lib/rails/generators/active_record/model/model_generator.rb +++ b/activerecord/lib/rails/generators/active_record/model/model_generator.rb @@ -59,7 +59,7 @@ module ActiveRecord def application_record_file_name @application_record_file_name ||= if mountable_engine? - "app/models/#{namespaced_path}/application_record.rb" + File.join("app/models", namespaced_path, "application_record.rb") else "app/models/application_record.rb" end -- cgit v1.2.3