diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-05-19 23:29:39 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-05-19 23:29:39 +0200 |
| commit | 7f07cc364a7ee7ceae21b29b54467fde0db93389 (patch) | |
| tree | 7c9dd8aaeda68731756ee108a8318239b04c80f0 /actionpack/lib/action_dispatch/routing/mapper.rb | |
| parent | b9fcd8d71f94702463b97545bb70ce4727c5b47e (diff) | |
| parent | 61001e766de974a8864c0bc2cf915888d277a0ea (diff) | |
| download | rails-7f07cc364a7ee7ceae21b29b54467fde0db93389.tar.gz rails-7f07cc364a7ee7ceae21b29b54467fde0db93389.tar.bz2 rails-7f07cc364a7ee7ceae21b29b54467fde0db93389.zip | |
Merge remote branch 'rails/master'
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/mapper.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index 4b02c2deb3..8a8d21c434 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -693,6 +693,11 @@ module ActionDispatch super end + def root(options={}) + options[:on] ||= :collection if @scope[:scope_level] == :resources + super(options) + end + protected def parent_resource #:nodoc: @scope[:scope_level_resource] |