diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2005-02-17 19:40:58 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-02-17 19:40:58 +0000 |
commit | 2713960dfc2739bcbda7dfeb400bb51913d365a1 (patch) | |
tree | 80e587221b7db212f23c186692884c36ad9657ff /railties/lib/rails_generator/generators/components/scaffold | |
parent | 96d3f152227b31e1ca2f0ac2814dda741dccaaea (diff) | |
download | rails-2713960dfc2739bcbda7dfeb400bb51913d365a1.tar.gz rails-2713960dfc2739bcbda7dfeb400bb51913d365a1.tar.bz2 rails-2713960dfc2739bcbda7dfeb400bb51913d365a1.zip |
Check class path for conflicts on generation #640 [bitsweat]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@655 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/lib/rails_generator/generators/components/scaffold')
-rw-r--r-- | railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb b/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb index 883bae7d3d..67f17dc874 100644 --- a/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb +++ b/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb @@ -57,7 +57,7 @@ class ScaffoldGenerator < Rails::Generator::NamedBase m.dependency 'model', [@name], :collision => :skip # Check for class naming collisions. - m.class_collisions "#{controller_class_name}Controller", "#{controller_class_name}ControllerTest", "#{controller_class_name}Helper" + m.class_collisions controller_class_path, "#{controller_class_name}Controller", "#{controller_class_name}ControllerTest", "#{controller_class_name}Helper" # Controller, helper, views, and test directories. m.directory File.join('app/controllers', controller_class_path) |