Download as
Browse Code »

Commit 0c8eff93411b037fb8374bd149f2f494d675d499

Authored by Antonio Terceiro
1 parent 771ecf69
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

rails3: remove useless named scope in Article 

It seems it was created to avoid including too many objects when
retrieving that named_scope, but using :joins instead of :includes
already does this.
Showing 2 changed files with 2 additions and 4 deletions   Show diff stats
app/models/article.rb
  Diff comments   View file @0c8eff9
@@ -217,10 +217,8 @@ class Article < ActiveRecord::Base @@ -217,10 +217,8 @@ class Article < ActiveRecord::Base
217 {:conditions => [ 'parent_id is null and profile_id = ?', profile.id ]} 217 {:conditions => [ 'parent_id is null and profile_id = ?', profile.id ]}
218 } 218 }
219 219
220 - scope :join_profile, :joins => [:profile]  
221 -  
222 scope :public, 220 scope :public,
223 - :conditions => [ "advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ?", true, true, true, true ] 221 + :conditions => [ "advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ?", true, true, true, true ], :joins => [:profile]
224 222
225 scope :more_recent, 223 scope :more_recent,
226 :conditions => [ "advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ? AND 224 :conditions => [ "advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ? AND
test/unit/article_test.rb
  Diff comments   View file @0c8eff9
@@ -1618,7 +1618,7 @@ class ArticleTest < ActiveSupport::TestCase @@ -1618,7 +1618,7 @@ class ArticleTest < ActiveSupport::TestCase
1618 art4 = Article.create!(:name => 'article 4', :profile_id => fast_create(Person, :visible => false).id) 1618 art4 = Article.create!(:name => 'article 4', :profile_id => fast_create(Person, :visible => false).id)
1619 art5 = Article.create!(:name => 'article 5', :profile_id => fast_create(Person, :public_profile => false).id) 1619 art5 = Article.create!(:name => 'article 5', :profile_id => fast_create(Person, :public_profile => false).id)
1620 1620
1621 - articles = Article.join_profile.public 1621 + articles = Article.public
1622 assert_includes articles, art1 1622 assert_includes articles, art1
1623 assert_not_includes articles, art2 1623 assert_not_includes articles, art2
1624 assert_not_includes articles, art3 1624 assert_not_includes articles, art3