From d5e48ae7d278cb6e03bef104eac23ac5cad46c5a Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Fri, 28 Oct 2005 15:42:16 +0000 Subject: Use the old way of getting args to the scaffold generator and un-screwup the controller name assignment appropriately. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2783 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- .../generators/components/scaffold/scaffold_generator.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'railties/lib/rails_generator/generators') 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 7ac2ac76e9..e589a9e233 100644 --- a/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb +++ b/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb @@ -47,11 +47,9 @@ class ScaffoldGenerator < Rails::Generator::NamedBase def initialize(runtime_args, runtime_options = {}) super - if runtime_args.length > 1 - @controller_name = runtime_args[1] - else - @controller_name = (ActiveRecord::Base.pluralize_table_names ? @name.pluralize : @name) - end + # Take controller name from the next argument. Default to the pluralized model name. + @controller_name = args.shift + @controller_name ||= ActiveRecord::Base.pluralize_table_names ? @name.pluralize : @name base_name, @controller_class_path, @controller_file_path, @controller_class_nesting, @controller_class_nesting_depth = extract_modules(@controller_name) @controller_class_name_without_nesting, @controller_singular_name, @controller_plural_name = inflect_names(base_name) -- cgit v1.2.3