kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

AppGenerator: use options instead of @options

Browse source
This commit is contained in:
Piotr Sarnacki 2010-12-15 13:08:49 +01:00
parent 2dafb14c28
commit 17afec0ae3
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
railties/lib/rails/generators/rails/app/app_generator.rb
View file

@ -63,7 +63,7 @@ module Rails
end
def database_yml
template "config/databases/#{@options[:database]}.yml", "config/database.yml"
template "config/databases/#{options[:database]}.yml", "config/database.yml"
end
def db
@ -106,8 +106,8 @@ module Rails
empty_directory "public/javascripts"
unless options[:skip_javascript]
copy_file "public/javascripts/#{@options[:javascript]}.js"
copy_file "public/javascripts/#{@options[:javascript]}_ujs.js", "public/javascripts/rails.js"
copy_file "public/javascripts/#{options[:javascript]}.js"
copy_file "public/javascripts/#{options[:javascript]}_ujs.js", "public/javascripts/rails.js"
if options[:javascript] == "prototype"
copy_file "public/javascripts/controls.js"