github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-25 22:38:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed that generate scaffold claims all words are reserved #2200, #2211 [alancfrancis@gmail.com]

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2253 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
David Heinemeier Hansson
2005-09-17 06:36:04 +00:00
parent 9acb1f95c9
commit dfd0bdf1a0
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb
View File

@@ -67,6 +67,9 @@ class ScaffoldGenerator < Rails::Generator::NamedBase
m.directory File.join('app/views', controller_class_path, controller_file_name)
m.directory File.join('test/functional', controller_class_path)
# Depend on model generator but skip if the model exists.
m.dependency 'model', [singular_name], :collision => :skip
# Scaffolded forms.
m.complex_template "form.rhtml",
File.join('app/views',
@@ -79,8 +82,6 @@ class ScaffoldGenerator < Rails::Generator::NamedBase
:end_mark => 'eoform',
:mark_id => singular_name
# Depend on model generator but skip if the model exists.
m.dependency 'model', [singular_name], :collision => :skip
# Scaffolded views.
scaffold_views.each do |action|