From b0b5ee958ae59f3f85c538d133f38d069e9052f5 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Fri, 25 May 2007 21:15:46 +0000 Subject: Scaffold generator depends on model generator instead of duplicating it. Closes #7222. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6840 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- .../generators/components/scaffold/scaffold_generator.rb | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb') 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 8a331867eb..11c80d2020 100644 --- a/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb +++ b/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb @@ -51,7 +51,7 @@ class ScaffoldGenerator < Rails::Generator::NamedBase m.template('layout.html.erb', File.join('app/views/layouts', controller_class_path, "#{controller_file_name}.html.erb")) m.template('style.css', 'public/stylesheets/scaffold.css') - m.template('model.rb', File.join('app/models', class_path, "#{file_name}.rb")) + m.dependency 'model', [singular_name] + @args, :collision => :skip m.template( 'controller.rb', File.join('app/controllers', controller_class_path, "#{controller_file_name}_controller.rb") @@ -59,19 +59,6 @@ class ScaffoldGenerator < Rails::Generator::NamedBase m.template('functional_test.rb', File.join('test/functional', controller_class_path, "#{controller_file_name}_controller_test.rb")) m.template('helper.rb', File.join('app/helpers', controller_class_path, "#{controller_file_name}_helper.rb")) - m.template('unit_test.rb', File.join('test/unit', class_path, "#{file_name}_test.rb")) - m.template('fixtures.yml', File.join('test/fixtures', "#{table_name}.yml")) - - unless options[:skip_migration] - m.migration_template( - 'migration.rb', 'db/migrate', - :assigns => { - :migration_name => "Create#{class_name.pluralize.gsub(/::/, '')}", - :attributes => attributes - }, - :migration_file_name => "create_#{file_path.gsub(/\//, '_').pluralize}" - ) - end m.route_resources controller_file_name end -- cgit v1.2.3