diff options
| author | Yves Senn <yves.senn@gmail.com> | 2015-06-29 14:17:30 +0200 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2015-06-29 14:23:26 +0200 |
| commit | 3cd0530df6eddf3b68cd42e5893ed0eb702ba780 (patch) | |
| tree | 373225c976c1af2ff2cddd863e87a8982f6dcdff /railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb | |
| parent | d4b0e5f59f599a386d43a7f4d005430e87ae7ec4 (diff) | |
| parent | b1738e1a0222d5109cd906e3eb34458741a615db (diff) | |
| download | rails-3cd0530df6eddf3b68cd42e5893ed0eb702ba780.tar.gz rails-3cd0530df6eddf3b68cd42e5893ed0eb702ba780.tar.bz2 rails-3cd0530df6eddf3b68cd42e5893ed0eb702ba780.zip | |
Merge pull request #20724 from y-yagi/fix_scaffold_in_full_engine
fix NoMethodError that occurs when generating scaffold inside full mode engine
Diffstat (limited to 'railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb')
| -rw-r--r-- | railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb index d634584beb..0171da7cc7 100644 --- a/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb +++ b/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb @@ -21,7 +21,7 @@ module TestUnit # :nodoc: def fixture_name @fixture_name ||= - if defined?(ENGINE_ROOT) + if mountable_engine? "%s_%s" % [namespaced_path, table_name] else table_name |