github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-29 16:28:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

Nested controller scaffolding also nests the generated layout.

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4735 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jeremy Kemper
2006-08-09 02:22:04 +00:00
parent f06cae3652
commit e448b340ab
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
railties/CHANGELOG
View File

@@ -1,16 +1,16 @@
*SVN*
<<<<<<< .mine
* Nested controller scaffolding also nests the generated layout. [iain d broadf
oot]
* Add "require 'dispatcher'" to webrick server in the continuing quest to squash webrick weirdness. [Nicholas Seckar]
* Add autoload_paths support to Initializer. [Nicholas Seckar]
=======
* Fix Dispatcher.reset_application! so that AR subclasses are removed and Observers re-initialized *after* Reloadable classes are removed. Closes #5743. [Rick Olson]
* Clarify usage of script/plugin source. Closes #5344. [james.adam@gmail.com]
>>>>>>> .r4727
* Add Dispatcher.to_prepare and config.to_prepare to provide a pre-request hook. [Nicholas Seckar]
* Tweak the Rails load order so observers are loaded after plugins, and reloaded in development mode. Closed #5279. [Rick Olson]

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

@@ -70,6 +70,7 @@ class ScaffoldGenerator < Rails::Generator::NamedBase
m.directory File.join('app/controllers', controller_class_path)
m.directory File.join('app/helpers', controller_class_path)
m.directory File.join('app/views', controller_class_path, controller_file_name)
m.directory File.join('app/views/layouts', controller_class_path)
m.directory File.join('test/functional', controller_class_path)
# Depend on model generator but skip if the model exists.