diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-04-06 15:38:05 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-04-06 15:38:05 -0700 |
| commit | 4c4fd1a60ff1c060e76e9ee540074756510f53ea (patch) | |
| tree | 77da1c66c127e36c8b00825b676d9267a9ef4cd6 /railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb | |
| parent | 03cb74b9461293b96ae0add8ff5efda132dabba0 (diff) | |
| parent | af130575249571464ec984efa84fcea1267e8cf8 (diff) | |
| download | rails-4c4fd1a60ff1c060e76e9ee540074756510f53ea.tar.gz rails-4c4fd1a60ff1c060e76e9ee540074756510f53ea.tar.bz2 rails-4c4fd1a60ff1c060e76e9ee540074756510f53ea.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb')
| -rw-r--r-- | railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb index f607e580a5..2db7f7bbf3 100644 --- a/railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb +++ b/railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb @@ -8,7 +8,6 @@ module Erb argument :attributes, :type => :array, :default => [], :banner => "field:type field:type" - class_option :layout, :type => :boolean class_option :singleton, :type => :boolean, :desc => "Supply to skip index view" def create_root_folder @@ -25,12 +24,6 @@ module Erb end end - def copy_layout_file - return unless options[:layout] - template filename_with_extensions(:layout), - File.join("app/views/layouts", controller_class_path, filename_with_extensions(controller_file_name)) - end - protected def available_views |