Download as
Browse Code »

Commit 9986427022d2ce43200b46850c5a1a54beb1a1c1

Authored by Braulio Bhavamitra
1 parent cae48f79
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Fix named to not join

Showing 2 changed files with 4 additions and 3 deletions   Show diff stats
app/models/article.rb
  Diff comments   View file @9986427
@@ -152,9 +152,10 @@ class Article < ActiveRecord::Base @@ -152,9 +152,10 @@ class Article < ActiveRecord::Base
152 {:conditions => [ 'parent_id is null and profile_id = ?', profile.id ]} 152 {:conditions => [ 'parent_id is null and profile_id = ?', profile.id ]}
153 } 153 }
154 154
  155 + named_scope :join_profile, :joins => [:profile]
  156 +
155 named_scope :public, 157 named_scope :public,
156 - :conditions => [ "advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ?", true, true, true, true ],  
157 - :include => [:profile] 158 + :conditions => [ "advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ?", true, true, true, true ]
158 159
159 named_scope :more_recent, 160 named_scope :more_recent,
160 :conditions => [ "advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ? AND 161 :conditions => [ "advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ? AND
test/unit/article_test.rb
  Diff comments   View file @9986427
@@ -1773,7 +1773,7 @@ class ArticleTest < ActiveSupport::TestCase @@ -1773,7 +1773,7 @@ class ArticleTest < ActiveSupport::TestCase
1773 art4 = Article.create!(:name => 'article 4', :profile_id => fast_create(Person, :visible => false).id) 1773 art4 = Article.create!(:name => 'article 4', :profile_id => fast_create(Person, :visible => false).id)
1774 art5 = Article.create!(:name => 'article 5', :profile_id => fast_create(Person, :public_profile => false).id) 1774 art5 = Article.create!(:name => 'article 5', :profile_id => fast_create(Person, :public_profile => false).id)
1775 1775
1776 - articles = Article.public 1776 + articles = Article.join_profile.public
1777 assert_includes articles, art1 1777 assert_includes articles, art1
1778 assert_not_includes articles, art2 1778 assert_not_includes articles, art2
1779 assert_not_includes articles, art3 1779 assert_not_includes articles, art3