Download as
Browse Code »

Commit f83032b76e818cf8221262170c8913145cdd2f91

Authored by Rodrigo Souto
Committed by Daniela Feitosa
1 parent c52de943
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

Don't show news tab on organizations private profiles if not member 

(ActionItem1847)
Showing 2 changed files with 14 additions and 1 deletions   Show diff stats
app/views/profile/_profile.rhtml
  Diff comments   View file @f83032b
@@ -10,7 +10,9 @@ @@ -10,7 +10,9 @@
10 <% end %> 10 <% end %>
11 11
12 <% if @profile.organization? %> 12 <% if @profile.organization? %>
13 - <% tabs << {:title => _('What\'s new'), :id => 'profile-network', :content => (render :partial => 'profile_network')} %> 13 + <% if @profile.public? || (logged_in? && current_person.follows?(@profile)) %>
  14 + <% tabs << {:title => _('What\'s new'), :id => 'profile-network', :content => (render :partial => 'profile_network')} %>
  15 + <% end %>
14 <% tabs << {:title => _('Profile'), :id => 'organization-profile', :content => (render :partial => 'organization_profile')} %> 16 <% tabs << {:title => _('Profile'), :id => 'organization-profile', :content => (render :partial => 'organization_profile')} %>
15 <% elsif @profile.person? %> 17 <% elsif @profile.person? %>
16 <% if logged_in? && current_person.follows?(@profile) %> 18 <% if logged_in? && current_person.follows?(@profile) %>
features/private_profile.feature
  Diff comments   View file @f83032b
@@ -29,3 +29,14 @@ Feature: private profiles @@ -29,3 +29,14 @@ Feature: private profiles
29 And I follow "Add friend" 29 And I follow "Add friend"
30 When I go to shygirl's homepage 30 When I go to shygirl's homepage
31 Then I should not see "Add friend" 31 Then I should not see "Add friend"
  32 +
  33 + Scenario: viewing a private community profile shouldn't show the news if not logged or not a member
  34 + Given I am on Safernet's homepage
  35 + Then I should not see "What's new"
  36 + And I am logged in as "joao"
  37 + When I am on Safernet's homepage
  38 + Then I should not see "What's new"
  39 + And "joao" is a member of "Safernet"
  40 + When I am on Safernet's homepage
  41 + Then I should see "What's new"
  42 +