Download as
Browse Code »

Commit 6fb823a93b9dc95f54f16e7f4c094ef70a8f5537

Authored by Leandro Santos
1 parent 4fbaaa68
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

Plugin-PeopleBlock: load suggestions with suggested_profiles named scope

Showing 3 changed files with 5 additions and 5 deletions   Show diff stats
plugins/people_block/lib/friends_block.rb
  Diff comments   View file @6fb823a
@@ -17,7 +17,7 @@ class FriendsBlock < PeopleBlockBase @@ -17,7 +17,7 @@ class FriendsBlock < PeopleBlockBase
17 end 17 end
18 18
19 def suggestions 19 def suggestions
20 - owner.profile_suggestions.of_person.enabled.limit(3).includes(:suggestion) 20 + owner.suggested_profiles.of_person.enabled.limit(3).includes(:suggestion)
21 end 21 end
22 22
23 def footer 23 def footer
plugins/people_block/test/functional/profile_controller_test.rb
  Diff comments   View file @6fb823a
@@ -17,8 +17,8 @@ class ProfileControllerTest < ActionController::TestCase @@ -17,8 +17,8 @@ class ProfileControllerTest < ActionController::TestCase
17 login_as(user.login) 17 login_as(user.login)
18 owner = user.person 18 owner = user.person
19 19
20 - suggestion1 = owner.profile_suggestions.create(:suggestion => fast_create(Person))  
21 - suggestion2 = owner.profile_suggestions.create(:suggestion => fast_create(Person)) 20 + suggestion1 = ProfileSuggestion.create!(:suggestion => fast_create(Person), :person => owner)
  21 + suggestion2 = ProfileSuggestion.create!(:suggestion => fast_create(Person), :person => owner)
22 22
23 FriendsBlock.delete_all 23 FriendsBlock.delete_all
24 block = FriendsBlock.new 24 block = FriendsBlock.new
plugins/people_block/test/unit/friends_block_test.rb
  Diff comments   View file @6fb823a
@@ -138,8 +138,8 @@ class FriendsBlockTest < ActionView::TestCase @@ -138,8 +138,8 @@ class FriendsBlockTest < ActionView::TestCase
138 138
139 should 'list owner\'s friends suggestions' do 139 should 'list owner\'s friends suggestions' do
140 owner = fast_create(Person) 140 owner = fast_create(Person)
141 - suggestion1 = owner.profile_suggestions.create(:suggestion => fast_create(Person))  
142 - suggestion2 = owner.profile_suggestions.create(:suggestion => fast_create(Person)) 141 + suggestion1 = ProfileSuggestion.create!(:suggestion => fast_create(Person), :person => owner)
  142 + suggestion2 = ProfileSuggestion.create!(:suggestion => fast_create(Person), :person => owner)
143 143
144 block = FriendsBlock.new 144 block = FriendsBlock.new
145 block.stubs(:owner).returns(owner) 145 block.stubs(:owner).returns(owner)