diff --git a/app/views/layouts/_user_brief_introduction.html.erb b/app/views/layouts/_user_brief_introduction.html.erb index 233d6115b..eeea68b2f 100644 --- a/app/views/layouts/_user_brief_introduction.html.erb +++ b/app/views/layouts/_user_brief_introduction.html.erb @@ -1,6 +1,6 @@
- <% if !user.user_extensions.school_id.blank? %> + <% if !(user.user_extensions.school_id.blank? || user.user_extensions.school.nil?) %> <%= user.user_extensions.school.name %> <% end %>
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb index 6be6ca460..a1db5652d 100644 --- a/app/views/layouts/new_base_user.html.erb +++ b/app/views/layouts/new_base_user.html.erb @@ -99,7 +99,7 @@

<%= @user.login %>

- <% if !@user.user_extensions.school_id.blank? %> + <% if !(@user.user_extensions.school_id.blank? || @user.user_extensions.school.nil?) %> <%= @user.user_extensions.school.name %> <% end %>