Download as
Browse Code »

Commit 6b5e3fe9af8d47714383d69108a22c7d6d224ef8

Authored by Daniela Feitosa
2 parents aa2ee731 0c5d448b
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

Merge commit 'refs/merge-requests/82' of git://gitorious.org/noosfero/noosfero i… 

…nto merge-requests/82
Showing 3 changed files with 19 additions and 10 deletions   Show diff stats
app/views/profile/_profile.rhtml
  Diff comments   View file @6b5e3fe
@@ -11,19 +11,14 @@ @@ -11,19 +11,14 @@
11 <% end %> 11 <% end %>
12 12
13 <% if @profile.organization? %> 13 <% if @profile.organization? %>
14 - <% if @profile.public? || (logged_in? && current_person.follows?(@profile)) %>  
15 - <% tabs << {:title => _('What\'s new'), :id => 'profile-network', :content => (render :partial => 'profile_network')} %>  
16 - <% end %> 14 + <% tabs << {:title => _('What\'s new'), :id => 'profile-network', :content => (render :partial => 'profile_network')} %>
17 <% tabs << {:title => _('Profile'), :id => 'organization-profile', :content => (render :partial => 'organization_profile')} %> 15 <% tabs << {:title => _('Profile'), :id => 'organization-profile', :content => (render :partial => 'organization_profile')} %>
18 <% elsif @profile.person? %> 16 <% elsif @profile.person? %>
19 <% if logged_in? && current_person.follows?(@profile) %> 17 <% if logged_in? && current_person.follows?(@profile) %>
20 <% tabs << {:title => _('Network'), :id => 'profile-network', :content => (render :partial => 'profile_network')} %> 18 <% tabs << {:title => _('Network'), :id => 'profile-network', :content => (render :partial => 'profile_network')} %>
21 <% end %> 19 <% end %>
22 20
23 - <% if @profile.public? || (logged_in? && current_person.follows?(@profile)) %>  
24 - <% tabs << {:title => _('Activity'), :id => 'profile-activity', :content => (render :partial => 'profile_activity')} %>  
25 - <% end %>  
26 - 21 + <% tabs << {:title => _('Activity'), :id => 'profile-activity', :content => (render :partial => 'profile_activity')} %>
27 <% tabs << {:title => _('Profile'), :id => 'person-profile', :content => (render :partial => 'person_profile')} %> 22 <% tabs << {:title => _('Profile'), :id => 'person-profile', :content => (render :partial => 'person_profile')} %>
28 <% end %> 23 <% end %>
29 24
app/views/profile/index.rhtml
  Diff comments   View file @6b5e3fe
@@ -15,6 +15,8 @@ @@ -15,6 +15,8 @@
15 </div> 15 </div>
16 <% end %> 16 <% end %>
17 17
18 -<table class='profile'>  
19 - <%= render :partial => 'profile' %>  
20 -</table> 18 +<% if @profile.public? || (logged_in? && current_person.follows?(@profile)) %>
  19 + <table class='profile'>
  20 + <%= render :partial => 'profile' %>
  21 + </table>
  22 +<% end %>
features/private_profile.feature
  Diff comments   View file @6b5e3fe
@@ -40,3 +40,15 @@ Feature: private profiles @@ -40,3 +40,15 @@ Feature: private profiles
40 When I am on Safernet's homepage 40 When I am on Safernet's homepage
41 Then I should see "What's new" 41 Then I should see "What's new"
42 42
  43 + Scenario: person private profiles should not display sensible information
  44 + Given I am logged in as "joao"
  45 + When I go to shygirl's homepage
  46 + Then I should not see "Basic information"
  47 + Then I should not see "Work"
  48 + Then I should not see "Enterprises"
  49 + Then I should not see "Network"
  50 +
  51 + Scenario: community private profiles should not display sensible information
  52 + Given I am logged in as "joao"
  53 + When I go to Safernet's homepage
  54 + Then I should not see "Basic information"