diff options
| author | Rick Olson <technoweenie@gmail.com> | 2007-01-08 01:07:48 +0000 |
|---|---|---|
| committer | Rick Olson <technoweenie@gmail.com> | 2007-01-08 01:07:48 +0000 |
| commit | 0727af86fccb249f361901540d2977c2180be930 (patch) | |
| tree | cef1102de64ea2dac50a64506dd0c4c2e98b6206 /actionpack | |
| parent | 31fb0deec16d1911a9c7892089e4d695f90a6425 (diff) | |
| download | rails-0727af86fccb249f361901540d2977c2180be930.tar.gz rails-0727af86fccb249f361901540d2977c2180be930.tar.bz2 rails-0727af86fccb249f361901540d2977c2180be930.zip | |
Fix bug where nested resources ignore a parent singleton parent's path prefix. Closes #6940 [Dan Kubb]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5872 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/resources.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/controller/resources_test.rb | 13 |
3 files changed, 16 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index c63c5fcc49..9ecadc4551 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fix bug where nested resources ignore a parent singleton parent's path prefix. Closes #6940 [Dan Kubb] + * Fix no method error with error_messages_on. Closes #6935 [nik.wakelin Koz] * Slight doc tweak to the ActionView::Helpers::PrototypeHelper#replace docs. Closes #6922 [Steven Bristol] diff --git a/actionpack/lib/action_controller/resources.rb b/actionpack/lib/action_controller/resources.rb index 94f944f842..fd3c08c303 100644 --- a/actionpack/lib/action_controller/resources.rb +++ b/actionpack/lib/action_controller/resources.rb @@ -307,7 +307,7 @@ module ActionController map_member_actions(map, resource) if block_given? - with_options(:path_prefix => resource.singular, &block) + with_options(:path_prefix => resource.nesting_path_prefix, &block) end end end diff --git a/actionpack/test/controller/resources_test.rb b/actionpack/test/controller/resources_test.rb index be0d6d1814..0ae9240598 100644 --- a/actionpack/test/controller/resources_test.rb +++ b/actionpack/test/controller/resources_test.rb @@ -247,6 +247,19 @@ class ResourcesTest < Test::Unit::TestCase assert_simply_restful_for :messages, :path_prefix => 'account/' end end + + def test_should_nest_resources_in_singleton_resource_with_path_prefix + with_routing do |set| + set.draw do |map| + map.resource(:account, :path_prefix => ':site_id') do |account| + account.resources :messages + end + end + + assert_singleton_restful_for :account, :path_prefix => '7/', :options => { :site_id => '7' } + assert_simply_restful_for :messages, :path_prefix => '7/account/', :options => { :site_id => '7' } + end + end def test_should_nest_singleton_resource_in_resources with_routing do |set| |