Permalink
Browse files

Fixed that generate scaffold claims all words are reserved #2200, #2211

… [alancfrancis@gmail.com]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2253 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 9acb1f9 commit dfd0bdf1a0970c988419d12f2c22da2fc26dece7 @dhh dhh committed Sep 17, 2005
@@ -67,6 +67,9 @@ def manifest
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 @@ def manifest
: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|

0 comments on commit dfd0bdf

Please sign in to comment.