Changeset 7447

Timestamp:

09/10/07 14:31:44 (1 year ago)

Author:

david

Message:

Fixed that resource namespaces wouldnt stick to all nested resources (closes #9399) [pixeltrix]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/resources.rb (modified) (3 diffs)
• trunk/actionpack/test/controller/resources_test.rb (modified) (2 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Fixed that resource namespaces wouldn't stick to all nested resources #9399 [pixeltrix]
-
-* Moved ActionController::Macros::InPlaceEditing into the in_place_editor plugin on the official Rails svn #9513 [lifofifo]

trunk/actionpack/lib/action_controller/resources.rb

@@ -395 +395 @@
-
-          if block_given?
-
+:namespace => options[:namespace], 
-          end
-        end
@@ -412 +412 @@
-
-          if block_given?
-
+:namespace => options[:namespace], 
-          end
-        end
@@ -420 +420 @@
-        path_prefix = "#{options.delete(:path_prefix)}#{resource.nesting_path_prefix}"
-        name_prefix = "#{options.delete(:name_prefix)}#{resource.nesting_name_prefix}"
-        namespace = options.delete(:namespace)
-
-        Array(options[:has_many]).each do |association|
-namespace
+options[:namespace]
-        end
-
-        Array(options[:has_one]).each do |association|
-namespace
+options[:namespace]
-        end
-      end

trunk/actionpack/test/controller/resources_test.rb

@@ -20 +20 @@
-  class TagsController < ResourcesController; end
-  class ManufacturersController < ResourcesController; end
+  class ImagesController < ResourcesController; end
-
-  module Admin
-    class ProductsController < ResourcesController; end
+    class ImagesController < ResourcesController; end
-  end
-end
@@ -577 +579 @@
-    end
-  end
+  
+  def test_nested_resources_using_namespace
+    with_routing do |set|
+      set.draw do |map|
+        map.namespace :backoffice do |backoffice|
+          backoffice.resources :products do |products|
+            products.resources :images
+          end
+        end
+      end
+
+      assert_simply_restful_for :images, :controller => "backoffice/images", :name_prefix => 'backoffice_product_', :path_prefix => 'backoffice/products/1/', :options => {:product_id => '1'}
+    end
+  end
+
+  def test_nested_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 do |products|
+              products.resources :images
+            end
+          end
+        end
+      end
+
+      assert_simply_restful_for :images, :controller => "backoffice/admin/images", :name_prefix => 'backoffice_admin_product_', :path_prefix => 'backoffice/admin/products/1/', :options => {:product_id => '1'}
+    end
+  end
-
-  protected