Download as
Browse Code »

Commit bd9bbf38071f1a4572a95009987b0b50165eb2c7

Authored by Rodrigo Souto
1 parent 852b5dff
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

[template-welcome-page] Avoid crash on welcome page when there is no template

Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
app/controllers/public/home_controller.rb
  Diff comments   View file @bd9bbf3
@@ -21,8 +21,8 @@ class HomeController < PublicController @@ -21,8 +21,8 @@ class HomeController < PublicController
21 def welcome 21 def welcome
22 self.class.no_design_blocks 22 self.class.no_design_blocks
23 @display_confirmation_tips = !user.present? && !environment.enabled?(:skip_new_user_email_confirmation) 23 @display_confirmation_tips = !user.present? && !environment.enabled?(:skip_new_user_email_confirmation)
24 - @person_template = Person.find(params[:template_id])  
25 - @template_welcome_page = @person_template.welcome_page && @person_template.welcome_page.published ? @person_template.welcome_page.body : nil 24 + @person_template = user && user.template || params[:template_id] && Person.find(params[:template_id])
  25 + @template_welcome_page = @person_template && @person_template.welcome_page && @person_template.welcome_page.published ? @person_template.welcome_page.body : nil
26 end 26 end
27 27
28 end 28 end