From 9986427022d2ce43200b46850c5a1a54beb1a1c1 Mon Sep 17 00:00:00 2001 From: Braulio Bhavamitra Date: Sun, 20 May 2012 22:52:31 +0000 Subject: [PATCH] Fix named to not join --- app/models/article.rb | 5 +++-- test/unit/article_test.rb | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/models/article.rb b/app/models/article.rb index ef5c134..f4a300e 100644 --- a/app/models/article.rb +++ b/app/models/article.rb @@ -152,9 +152,10 @@ class Article < ActiveRecord::Base {:conditions => [ 'parent_id is null and profile_id = ?', profile.id ]} } + named_scope :join_profile, :joins => [:profile] + named_scope :public, - :conditions => [ "advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ?", true, true, true, true ], - :include => [:profile] + :conditions => [ "advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ?", true, true, true, true ] named_scope :more_recent, :conditions => [ "advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ? AND diff --git a/test/unit/article_test.rb b/test/unit/article_test.rb index e616cab..f286449 100644 --- a/test/unit/article_test.rb +++ b/test/unit/article_test.rb @@ -1773,7 +1773,7 @@ class ArticleTest < ActiveSupport::TestCase art4 = Article.create!(:name => 'article 4', :profile_id => fast_create(Person, :visible => false).id) art5 = Article.create!(:name => 'article 5', :profile_id => fast_create(Person, :public_profile => false).id) - articles = Article.public + articles = Article.join_profile.public assert_includes articles, art1 assert_not_includes articles, art2 assert_not_includes articles, art3 -- libgit2 0.21.2