partial counters with :as [rails#2804 state:resolved]

Signed-off-by: Jeremy Kemper <[email protected]>

Author: Jeff Kreeftmeijer

actionpack/lib/action_view/render/partials.rb

@@ -248,6 +248,7 @@ def collection_with_template(template = @template)
 
         @collection.each do |object|
           locals[counter_name] += 1
+          locals["#{as.to_s}_counter".to_sym] = locals[counter_name]
           locals[as] = object
 
           segments << template.render(@view, locals)

actionpack/test/controller/render_test.rb

@@ -547,6 +547,10 @@ def partial_collection_with_counter
     render :partial => "customer_counter", :collection => [ Customer.new("david"), Customer.new("mary") ]
   end
 
+  def partial_collection_with_as_and_counter
+    render :partial => "customer_counter_with_as", :collection => [ Customer.new("david"), Customer.new("mary") ], :as => :client
+  end
+
   def partial_collection_with_locals
     render :partial => "customer_greeting", :collection => [ Customer.new("david"), Customer.new("mary") ], :locals => { :greeting => "Bonjour" }
   end
@@ -1242,6 +1246,11 @@ def test_partial_collection_with_counter
     assert_equal "david0mary1", @response.body
   end
 
+  def test_partial_collection_with_as_and_counter
+    get :partial_collection_with_as_and_counter
+    assert_equal "david0mary1", @response.body
+  end
+
   def test_partial_collection_with_locals
     get :partial_collection_with_locals
     assert_equal "Bonjour: davidBonjour: mary", @response.body

actionpack/test/fixtures/test/_customer_counter_with_as.erb

@@ -0,0 +1 @@
+<%= client.name %><%= client_counter %>