jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

This commit is contained in:
cxt 2017-04-07 16:52:00 +08:00
parent 3cdf8c8a57 3e286f8ac3
commit 1f515d4ec5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/layouts/_user_brief_introduction.html.erb
View File

@ -1,6 +1,6 @@
<span>
<div class="user_info_intro">
<% 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 %>
</div>

2
app/views/layouts/new_base_user.html.erb
View File

@ -99,7 +99,7 @@
</h3>
<h4 class="fontGrey2 mb5"><%= @user.login %></h4>
<p class="fontGrey2">
<% 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 %>
</p>