aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederick Cheung <frederick.cheung@gmail.com>2008-06-05 20:48:42 +0100
committerPratik Naik <pratiknaik@gmail.com>2008-06-05 22:11:40 +0100
commit2e0765a00361781fb9bff2a7ca8996eab1f01bd4 (patch)
tree052d0f7d37f1e25cba948f3de7d396cfb911f52d
parentdf8154c845f8fb251c58f1fd882cc221cfdcbbc2 (diff)
downloadrails-2e0765a00361781fb9bff2a7ca8996eab1f01bd4.tar.gz
rails-2e0765a00361781fb9bff2a7ca8996eab1f01bd4.tar.bz2
rails-2e0765a00361781fb9bff2a7ca8996eab1f01bd4.zip
Make partial counter start from 0.
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
-rw-r--r--actionpack/lib/action_view/partial_template.rb2
-rw-r--r--actionpack/test/controller/new_render_test.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/partial_template.rb b/actionpack/lib/action_view/partial_template.rb
index 1fb3aaee02..0b374db888 100644
--- a/actionpack/lib/action_view/partial_template.rb
+++ b/actionpack/lib/action_view/partial_template.rb
@@ -22,10 +22,10 @@ module ActionView #:nodoc:
end
def render_member(object)
- @locals[@counter_name] += 1
@locals[:object] = @locals[@variable_name] = object
template = render_template
+ @locals[@counter_name] += 1
@locals.delete(@variable_name)
@locals.delete(:object)
diff --git a/actionpack/test/controller/new_render_test.rb b/actionpack/test/controller/new_render_test.rb
index 6e2c6d90c6..3b439a3b18 100644
--- a/actionpack/test/controller/new_render_test.rb
+++ b/actionpack/test/controller/new_render_test.rb
@@ -742,7 +742,7 @@ EOS
def test_partial_collection_with_counter
get :partial_collection_with_counter
- assert_equal "david1mary2", @response.body
+ assert_equal "david0mary1", @response.body
end
def test_partial_collection_with_locals
@@ -762,7 +762,7 @@ EOS
def test_partial_collection_shorthand_with_different_types_of_records
get :partial_collection_shorthand_with_different_types_of_records
- assert_equal "Bonjour bad customer: mark1Bonjour good customer: craig2Bonjour bad customer: john3Bonjour good customer: zach4Bonjour good customer: brandon5Bonjour bad customer: dan6", @response.body
+ assert_equal "Bonjour bad customer: mark0Bonjour good customer: craig1Bonjour bad customer: john2Bonjour good customer: zach3Bonjour good customer: brandon4Bonjour bad customer: dan5", @response.body
end
def test_empty_partial_collection