Permalink
Browse files

Fix bug where nested resources ignore a parent singleton parent's pat…

…h prefix. Closes #6940 [Dan Kubb]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5872 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 31fb0de commit 0727af86fccb249f361901540d2977c2180be930 @technoweenie technoweenie committed Jan 8, 2007
View
@@ -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]
@@ -307,7 +307,7 @@ def map_singleton_resource(entities, options = {}, &block)
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
@@ -247,6 +247,19 @@ def test_should_nest_resources_in_singleton_resource
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|

0 comments on commit 0727af8

Please sign in to comment.