Download as
Browse Code »

Commit 0d4ff2186ca6167cfb0207278e8bd6130f9af370

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

Fixing add_friend button on private profiles 

(ActionItem1783)
Showing 2 changed files with 3 additions and 1 deletions   Show diff stats
app/controllers/public/profile_controller.rb
  Diff comments   View file @0d4ff21
1 class ProfileController < PublicController 1 class ProfileController < PublicController
2 2
3 needs_profile 3 needs_profile
4 - before_filter :check_access_to_profile, :except => [:join, :join_not_logged, :index] 4 + before_filter :check_access_to_profile, :except => [:join, :join_not_logged, :index, :add]
5 before_filter :store_before_join, :only => [:join, :join_not_logged] 5 before_filter :store_before_join, :only => [:join, :join_not_logged]
6 before_filter :login_required, :only => [:add, :join, :join_not_logged, :leave, :unblock, :leave_scrap, :remove_scrap, :remove_activity, :view_more_scraps, :view_more_activities, :view_more_network_activities] 6 before_filter :login_required, :only => [:add, :join, :join_not_logged, :leave, :unblock, :leave_scrap, :remove_scrap, :remove_activity, :view_more_scraps, :view_more_activities, :view_more_network_activities]
7 7
features/private_profile.feature
  Diff comments   View file @0d4ff21
@@ -27,3 +27,5 @@ Feature: private profiles @@ -27,3 +27,5 @@ Feature: private profiles
27 When I go to shygirl's homepage 27 When I go to shygirl's homepage
28 Then I should see "friends only" 28 Then I should see "friends only"
29 And I follow "Add friend" 29 And I follow "Add friend"
  30 + When I go to shygirl's homepage
  31 + Then I should not see "Add friend"