Download as
Browse Code »

Commit 4e2c36f72e7913f3f17d2adccd0813e24b9166eb

Authored by Larissa Reis
1 parent abc047d1
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

Filter out community members

Showing 2 changed files with 15 additions and 0 deletions   Show diff stats
app/controllers/public/invite_controller.rb
  Diff comments   View file @4e2c36f
@@ -81,6 +81,7 @@ class InviteController < PublicController @@ -81,6 +81,7 @@ class InviteController < PublicController
81 fields = %w[name identifier email] + plugins_options.map {|field| field[:field].to_s } 81 fields = %w[name identifier email] + plugins_options.map {|field| field[:field].to_s }
82 values = ["%#{params['q']}%"] * fields.count 82 values = ["%#{params['q']}%"] * fields.count
83 render :text => environment.people.find(:all, :joins => ['INNER JOIN users ON profiles.user_id=users.id'], :conditions => [fields.map {|field| "LOWER(#{field}) LIKE ?"}.join(' OR '), *values]). 83 render :text => environment.people.find(:all, :joins => ['INNER JOIN users ON profiles.user_id=users.id'], :conditions => [fields.map {|field| "LOWER(#{field}) LIKE ?"}.join(' OR '), *values]).
  84 + select {|person| !profile.members.include?(person) }.
84 map {|person| {:id => person.id, :name => person.name} }.to_json 85 map {|person| {:id => person.id, :name => person.name} }.to_json
85 end 86 end
86 87
test/functional/invite_controller_test.rb
  Diff comments   View file @4e2c36f
@@ -255,6 +255,20 @@ class InviteControllerTest < ActionController::TestCase @@ -255,6 +255,20 @@ class InviteControllerTest < ActionController::TestCase
255 assert_equal [{"name" => friend1.name, "id" => friend1.id}, {"name" => friend2.name, "id" => friend2.id}].to_json, @response.body 255 assert_equal [{"name" => friend1.name, "id" => friend1.id}, {"name" => friend2.name, "id" => friend2.id}].to_json, @response.body
256 end 256 end
257 257
  258 + should 'not include members in search friends profiles' do
  259 + community.add_admin(profile)
  260 + friend1 = create_user('willy').person
  261 + friend2 = create_user('william').person
  262 + friend1.save
  263 + friend2.save
  264 +
  265 + community.add_member(friend2)
  266 +
  267 + get :search_friend, :profile => community.identifier, :q => 'will'
  268 +
  269 + assert_equal [{"name" => friend1.name, "id" => friend1.id}].to_json, @response.body
  270 + end
  271 +
258 should 'search friends profiles by fields provided by plugins' do 272 should 'search friends profiles by fields provided by plugins' do
259 class Plugin1 < Noosfero::Plugin 273 class Plugin1 < Noosfero::Plugin
260 def search_friend_fields 274 def search_friend_fields