mirror of
https://github.com/github/rails.git
synced 2026-02-11 22:55:05 -05:00
Move model dependency to the end of the scaffold generator manifest. Closes #10696 [drnic]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8558 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
@@ -54,8 +54,6 @@ class ScaffoldGenerator < Rails::Generator::NamedBase
|
||||
m.template('layout.html.erb', File.join('app/views/layouts', controller_class_path, "#{controller_file_name}.html.erb"))
|
||||
m.template('style.css', 'public/stylesheets/scaffold.css')
|
||||
|
||||
m.dependency 'model', [name] + @args, :collision => :skip
|
||||
|
||||
m.template(
|
||||
'controller.rb', File.join('app/controllers', controller_class_path, "#{controller_file_name}_controller.rb")
|
||||
)
|
||||
@@ -64,6 +62,8 @@ class ScaffoldGenerator < Rails::Generator::NamedBase
|
||||
m.template('helper.rb', File.join('app/helpers', controller_class_path, "#{controller_file_name}_helper.rb"))
|
||||
|
||||
m.route_resources controller_file_name
|
||||
|
||||
m.dependency 'model', [name] + @args, :collision => :skip
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user