Download as
Browse Code »

Commit f0d49dcbb3cf8c20284177cebc6593583078da3e

Authored by Daniela Feitosa
Committed by Antonio Terceiro
1 parent de91cf8b
Exists in master and in 28 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, stable, temp_ratings, tests, tests_fixies

ActionItem1062: removing popup when community is not public

Showing 2 changed files with 7 additions and 0 deletions   Show diff stats
app/models/person.rb
  Diff comments   View file @f0d49dc
@@ -229,6 +229,7 @@ class Person < Profile @@ -229,6 +229,7 @@ class Person < Profile
229 has_and_belongs_to_many :refused_communities, :class_name => 'Community', :join_table => 'refused_join_community' 229 has_and_belongs_to_many :refused_communities, :class_name => 'Community', :join_table => 'refused_join_community'
230 230
231 def ask_to_join?(community) 231 def ask_to_join?(community)
  232 + return false if !community.public_profile
232 return false if memberships.include?(community) 233 return false if memberships.include?(community)
233 return false if AddMember.find(:first, :conditions => {:requestor_id => self.id, :target_id => community.id}) 234 return false if AddMember.find(:first, :conditions => {:requestor_id => self.id, :target_id => community.id})
234 !refused_communities.include?(community) 235 !refused_communities.include?(community)
test/unit/person_test.rb
  Diff comments   View file @f0d49dc
@@ -534,4 +534,10 @@ class PersonTest < Test::Unit::TestCase @@ -534,4 +534,10 @@ class PersonTest < Test::Unit::TestCase
534 assert !p.ask_to_join?(c) 534 assert !p.ask_to_join?(c)
535 end 535 end
536 536
  537 + should 'not ask to join if community is not public' do
  538 + p = create_user('test_user').person
  539 + c = Community.create!(:name => 'Test community', :identifier => 'test_community', :public_profile => false)
  540 +
  541 + assert !p.ask_to_join?(c)
  542 + end
537 end 543 end