Skip to content
Browse files

Fixed render :partial => @collection.named_scope (nkallen) [#61 state…

…:resolved]
  • Loading branch information...
1 parent a6cca5d commit a3da293b3363a56c28773088cbf932115eb3a2b0 @dhh dhh committed Apr 30, 2008
View
2 actionpack/lib/action_view/partials.rb
@@ -111,7 +111,7 @@ def render_partial(partial_path, object_assigns = nil, local_assigns = {}) #:nod
when ActionView::Helpers::FormBuilder
builder_partial_path = partial_path.class.to_s.demodulize.underscore.sub(/_builder$/, '')
render_partial(builder_partial_path, object_assigns, (local_assigns || {}).merge(builder_partial_path.to_sym => partial_path))
- when Array, ActiveRecord::Associations::AssociationCollection, ActiveRecord::Associations::HasManyThroughAssociation
+ when Array, ActiveRecord::Associations::AssociationCollection, ActiveRecord::NamedScope::Scope
if partial_path.any?
collection = partial_path
render_partial_collection(nil, collection, nil, local_assigns)
View
17 actionpack/test/activerecord/render_partial_with_record_identification_test.rb
@@ -14,6 +14,10 @@ def render_with_has_many_association
render :partial => @topic.replies
end
+ def render_with_named_scope
+ render :partial => Reply.base
+ end
+
def render_with_has_many_through_association
@developer = Developer.find(:first)
render :partial => @developer.topics
@@ -53,16 +57,9 @@ def test_rendering_partial_with_has_many_association
assert_template 'replies/_reply'
end
- def test_rendering_partial_with_has_many_association
- get :render_with_has_many_through_association
- assert_template 'topics/_topic'
- end
-
- def test_rendering_partial_with_belongs_to_association
- topic = Reply.find(1).topic
- get :render_with_belongs_to_association
- assert_template 'topics/_topic'
- assert_equal topic.title, @response.body
+ def test_rendering_partial_with_named_scope
+ get :render_with_named_scope
+ assert_template 'replies/_reply'
end
def test_render_with_record
View
1 actionpack/test/fixtures/reply.rb
@@ -1,4 +1,5 @@
class Reply < ActiveRecord::Base
+ named_scope :base
belongs_to :topic, :include => [:replies]
belongs_to :developer

0 comments on commit a3da293

Please sign in to comment.
Something went wrong with that request. Please try again.