Download as
Browse Code »

Commit 4e2c36f72e7913f3f17d2adccd0813e24b9166eb

Authored by Larissa Reis
1 parent abc047d1
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

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 81 fields = %w[name identifier email] + plugins_options.map {|field| field[:field].to_s }
82 82 values = ["%#{params['q']}%"] * fields.count
83 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 85 map {|person| {:id => person.id, :name => person.name} }.to_json
85 86 end
86 87  
... ...
test/functional/invite_controller_test.rb
  Diff comments   View file @4e2c36f
... ... @@ -255,6 +255,20 @@ class InviteControllerTest < ActionController::TestCase
255 255 assert_equal [{"name" => friend1.name, "id" => friend1.id}, {"name" => friend2.name, "id" => friend2.id}].to_json, @response.body
256 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 272 should 'search friends profiles by fields provided by plugins' do
259 273 class Plugin1 < Noosfero::Plugin
260 274 def search_friend_fields
... ...