diff options
| author | Michael Koziarski <michael@koziarski.com> | 2008-10-14 11:26:09 +0200 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2008-10-14 21:59:55 +0200 |
| commit | 09c1718198c58d2e14d267cbd771b4853b311da1 (patch) | |
| tree | 69eef736210e2fdcb8113cea5216027b834428af /railties/lib/rails_generator/generators/components/scaffold | |
| parent | 3e9fc279e572d440df98fb17d83acd92b66b22dc (diff) | |
| download | rails-09c1718198c58d2e14d267cbd771b4853b311da1.tar.gz rails-09c1718198c58d2e14d267cbd771b4853b311da1.tar.bz2 rails-09c1718198c58d2e14d267cbd771b4853b311da1.zip | |
Remove the class_path from the collisions test.
The class_path is often taken already in situations like Admin namespaces etc.
Diffstat (limited to 'railties/lib/rails_generator/generators/components/scaffold')
| -rw-r--r-- | railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb | 4 |
1 files changed, 2 insertions, 2 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 5fecfe0167..ff0381da2a 100644 --- a/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb +++ b/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb @@ -36,8 +36,8 @@ class ScaffoldGenerator < Rails::Generator::NamedBase def manifest record do |m| # Check for class naming collisions. - m.class_collisions(controller_class_path, "#{controller_class_name}Controller", "#{controller_class_name}Helper") - m.class_collisions(class_path, "#{class_name}") + m.class_collisions("#{controller_class_name}Controller", "#{controller_class_name}Helper") + m.class_collisions(class_name) # Controller, helper, views, test and stylesheets directories. m.directory(File.join('app/models', class_path)) |