Changeset 2253

Timestamp:

09/17/05 06:36:04 (3 years ago)

Author:

david

Message:

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

Files:

• trunk/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb (modified) (2 diffs)

trunk/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb

@@ -68 +68 @@
-      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",
@@ -80 +83 @@
-        :mark_id => singular_name
-
-      # Depend on model generator but skip if the model exists.
-      m.dependency 'model', [singular_name], :collision => :skip
-
-      # Scaffolded views.