Download as
Browse Code »

Commit aa137131e2f6fc86f42ab09af477de16666db8fb

Authored by Antonio Terceiro
1 parent f88dad03
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

Better screen for private profiles 

(ActionItem1330)
Showing 3 changed files with 4 additions and 3 deletions   Show diff stats
app/controllers/application.rb
  Diff comments   View file @aa13713
@@ -124,9 +124,10 @@ class ApplicationController < ActionController::Base @@ -124,9 +124,10 @@ class ApplicationController < ActionController::Base
124 render :template => 'shared/not_found.rhtml', :status => 404 124 render :template => 'shared/not_found.rhtml', :status => 404
125 end 125 end
126 126
127 - def render_access_denied(message = nil) 127 + def render_access_denied(message = nil, title = nil)
128 @no_design_blocks = true 128 @no_design_blocks = true
129 @message = message 129 @message = message
  130 + @title = title
130 render :template => 'shared/access_denied.rhtml', :status => 403 131 render :template => 'shared/access_denied.rhtml', :status => 403
131 end 132 end
132 133
app/controllers/public/profile_controller.rb
  Diff comments   View file @aa13713
@@ -107,7 +107,7 @@ class ProfileController < PublicController @@ -107,7 +107,7 @@ class ProfileController < PublicController
107 107
108 def check_access_to_profile 108 def check_access_to_profile
109 unless profile.display_info_to?(user) 109 unless profile.display_info_to?(user)
110 - render :action => 'private_profile', :status => 403, :layout => false 110 + render_access_denied(_("Sorry, this profile was defined as private by its owner. You'll not be able to view content here unless the profile owner adds you."), _("Oops ... you cannot go ahead here"))
111 end 111 end
112 end 112 end
113 113
app/views/shared/access_denied.rhtml
  Diff comments   View file @aa13713
1 <div id='access-denied'> 1 <div id='access-denied'>
2 2
3 - <h1> <%= _('Access denied') %> </h1> 3 + <h1> <%= @title || _('Access denied') %> </h1>
4 4
5 <% unless @message.nil? %> 5 <% unless @message.nil? %>
6 <p><%= @message %></p> 6 <p><%= @message %></p>