aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/routing/mapper.rb
diff options
context:
space:
mode:
authorJan De Poorter <jan@defv.be>2010-04-14 10:34:42 +0200
committerJosé Valim <jose.valim@gmail.com>2010-06-08 23:21:53 +0200
commit4560385fa4fa6925aa220bbaf6b2608c2bbd7039 (patch)
treee0a6a620b11b7734a8ca9839a7e55f1586022e52 /actionpack/lib/action_dispatch/routing/mapper.rb
parentdb23a95a616860e4fefa4ef83b396abe7ec0ea71 (diff)
downloadrails-4560385fa4fa6925aa220bbaf6b2608c2bbd7039.tar.gz
rails-4560385fa4fa6925aa220bbaf6b2608c2bbd7039.tar.bz2
rails-4560385fa4fa6925aa220bbaf6b2608c2bbd7039.zip
Make sure namespaces are nested within resources
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/mapper.rb')
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 6db8d1aacc..0f267caefe 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -679,6 +679,14 @@ module ActionDispatch
end
end
+ def namespace(path)
+ if @scope[:scope_level] == :resources
+ nested { super }
+ else
+ super
+ end
+ end
+
def match(*args)
options = args.extract_options!