aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/resources.rb
diff options
context:
space:
mode:
authorRick Olson <technoweenie@gmail.com>2007-01-08 01:07:48 +0000
committerRick Olson <technoweenie@gmail.com>2007-01-08 01:07:48 +0000
commit0727af86fccb249f361901540d2977c2180be930 (patch)
treecef1102de64ea2dac50a64506dd0c4c2e98b6206 /actionpack/lib/action_controller/resources.rb
parent31fb0deec16d1911a9c7892089e4d695f90a6425 (diff)
downloadrails-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/lib/action_controller/resources.rb')
-rw-r--r--actionpack/lib/action_controller/resources.rb2
1 files changed, 1 insertions, 1 deletions
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