Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Allow nested namespaces in routing

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6748 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 04823ff48fbde3ecf7849a1e1a3d3bcc4cc71aa8 1 parent 4048628
Tobias Lütke authored
View
6 actionpack/lib/action_controller/resources.rb
@@ -351,7 +351,11 @@ def resource(*entities, &block)
# It'll also create admin_product_tags_url pointing to "admin/products/#{product_id}/tags", which will look for
# Admin::TagsController.
def namespace(name, options = {}, &block)
- with_options({ :path_prefix => name, :name_prefix => "#{name}_", :namespace => "#{name}/" }.merge(options), &block)
+ if options[:namespace]
+ with_options({:path_prefix => "#{options.delete(:path_prefix)}/#{name}", :name_prefix => "#{options.delete(:name_prefix)}#{name}_", :namespace => "#{options.delete(:namespace)}#{name}/" }.merge(options), &block)
+ else
+ with_options({ :path_prefix => name.to_s, :name_prefix => "#{name}_", :namespace => "#{name}/" }.merge(options), &block)
+ end
end
View
18 actionpack/test/controller/resources_test.rb
@@ -17,6 +17,10 @@ class AdminController < ResourcesController; end
module Backoffice
class ProductsController < ResourcesController; end
+
+ module Admin
+ class ProductsController < ResourcesController; end
+ end
end
class ResourcesTest < Test::Unit::TestCase
@@ -400,6 +404,20 @@ def test_resources_in_namespace
end
end
+ def test_resources_in_nested_namespace
+ with_routing do |set|
+ set.draw do |map|
+ map.namespace :backoffice do |backoffice|
+ backoffice.namespace :admin do |admin|
+ admin.resources :products
+ end
+ end
+ end
+
+ assert_simply_restful_for :products, :controller => "backoffice/admin/products", :name_prefix => 'backoffice_admin_', :path_prefix => 'backoffice/admin/'
+ end
+ end
+
def test_resources_using_namespace
with_routing do |set|
set.draw do |map|
Please sign in to comment.
Something went wrong with that request. Please try again.