diff options
| author | José Valim <jose.valim@gmail.com> | 2010-11-25 11:49:51 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-11-25 11:50:29 +0100 |
| commit | 731ca00b484379661786fac36c17db7e085603c4 (patch) | |
| tree | 200e427ad81f8b79e08d280d5dce812e928fe3a2 /actionpack/lib/action_dispatch/routing/mapper.rb | |
| parent | 90b0f6149160e6fedb12ea54f713ec3399bebec8 (diff) | |
| download | rails-731ca00b484379661786fac36c17db7e085603c4.tar.gz rails-731ca00b484379661786fac36c17db7e085603c4.tar.bz2 rails-731ca00b484379661786fac36c17db7e085603c4.zip | |
Dynamically generaeted helpers on collection should not clobber resources url helper [#6028 state:resolved]
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/mapper.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index 0b5437bd4f..880862c909 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -1299,6 +1299,8 @@ module ActionDispatch name_prefix = @scope[:as] if parent_resource + return nil if as.nil? && action.nil? + collection_name = parent_resource.collection_name member_name = parent_resource.member_name end |