diff options
| author | Robin Dupret <robin.dupret@gmail.com> | 2014-02-25 14:57:23 +0100 |
|---|---|---|
| committer | Robin Dupret <robin.dupret@gmail.com> | 2014-02-26 16:06:11 +0100 |
| commit | fc61bca31d899f359671d4b58bceb8b9d6555aa7 (patch) | |
| tree | d1377c903e19bd68f5fddcbde1cbd9f47ab90c06 /railties/lib/rails | |
| parent | 6d35190bad0b054c9a1f4c736dc4dda32a7ebc91 (diff) | |
| download | rails-fc61bca31d899f359671d4b58bceb8b9d6555aa7.tar.gz rails-fc61bca31d899f359671d4b58bceb8b9d6555aa7.tar.bz2 rails-fc61bca31d899f359671d4b58bceb8b9d6555aa7.zip | |
Avoid namespacing routes inside engines
Since #11544, invoking the controller generator, any generated route is
namespaced according to the class_path method. Since a mountable plugin
is namespaced, creating a controller inside would generate a namespaced
route based on the engine's name.
The controller generator now relies on regular_class_path which does not
contain the class hierarchy but the given path.
Fixes #14079.
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/generators/rails/controller/controller_generator.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/rails/controller/controller_generator.rb b/railties/lib/rails/generators/rails/controller/controller_generator.rb index 33a0d81bf6..7588a558e7 100644 --- a/railties/lib/rails/generators/rails/controller/controller_generator.rb +++ b/railties/lib/rails/generators/rails/controller/controller_generator.rb @@ -27,11 +27,11 @@ module Rails # end # end def generate_routing_code(action) - depth = class_path.length + depth = regular_class_path.length # Create 'namespace' ladder # namespace :foo do # namespace :bar do - namespace_ladder = class_path.each_with_index.map do |ns, i| + namespace_ladder = regular_class_path.each_with_index.map do |ns, i| indent("namespace :#{ns} do\n", i * 2) end.join |