Download as
Browse Code »

Commit 9ca1e5521e298df3be2cfeca57a49d98fe6e3dfe

Authored by Braulio Bhavamitra
2 parents cf00ed96 60b19a8f
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 branch 'fix_private_template' into 'master' 

Fix private template

This patch fix some cucumber tests(private_profile.feature). The template displayed for profiles internal pages was wrong(access_denied). We just changed for the correct one(private_profile).

See merge request !480
Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
app/controllers/public_controller.rb
  Diff comments   View file @9ca1e55
@@ -13,7 +13,7 @@ class PublicController < ApplicationController @@ -13,7 +13,7 @@ class PublicController < ApplicationController
13 13
14 def private_profile 14 def private_profile
15 private_profile_partial_parameters 15 private_profile_partial_parameters
16 - render :template => 'shared/access_denied.html.erb', :status => 403 16 + render :template => 'profile/_private_profile', :status => 403, :formats => [:html]
17 end 17 end
18 18
19 def invisible_profile 19 def invisible_profile