Changeset 3111
- Timestamp:
- 11/20/05 18:50:09 (3 years ago)
- Files:
-
- trunk/actionpack/CHANGELOG (modified) (1 diff)
- trunk/actionpack/lib/action_controller/layout.rb (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/actionpack/CHANGELOG
r3100 r3111 1 1 *SVN* 2 3 * Correct docs for automatic layout assignment. #2610. [Charles M. Gerungan] 2 4 3 5 * Always create new AR sessions rather than trying too hard to avoid database traffic. #2731 [Jeremy Kemper] trunk/actionpack/lib/action_controller/layout.rb
r3084 r3111 67 67 # the layout for your WeblogController. You can create a layout with the name <tt>application.rhtml</tt> or <tt>application.rxml</tt> 68 68 # and this will be set as the default controller if there is no layout with the same name as the current controller and there is 69 # no layout explicitly assigned with the +layout+ method. Setting a layout explicitly will always override the automatic behaviour. 69 # no layout explicitly assigned with the +layout+ method. Setting a layout explicitly will always override the automatic behaviour 70 # for the controller where the layout is set. Explicitly setting the layout in a parent class, though, will not override the 71 # child class's layout assignement if the child class has a layout with the same name. 70 72 # 71 73 # == Inheritance for layouts