diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-10-16 22:20:32 +0200 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-10-16 22:20:32 +0200 |
| commit | 0242d817035e60357e559af0e9441a1f24a764e4 (patch) | |
| tree | 1efa579fc261e55f76bacfa9818eb4a649d68294 /railties/lib/rails_generator/generators/components/scaffold | |
| parent | 7e2777348b88bf096ebc51e364554af19d7bcc55 (diff) | |
| parent | 9cb5400871b660e2c6d1654346650f07bb52a0c0 (diff) | |
| download | rails-0242d817035e60357e559af0e9441a1f24a764e4.tar.gz rails-0242d817035e60357e559af0e9441a1f24a764e4.tar.bz2 rails-0242d817035e60357e559af0e9441a1f24a764e4.zip | |
Merge with mainstream rails
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)) |