From 775774ad634559b6b64564999f85436f94adc607 Mon Sep 17 00:00:00 2001 From: Wen Date: Fri, 18 Apr 2014 14:46:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8E=AA=E6=96=BD=EF=BC=9A?= =?UTF-8?q?=E5=8D=B3=E4=BD=BF=E7=94=A8=E6=88=B7=E6=B2=A1=E6=9C=89=E5=A1=AB?= =?UTF-8?q?=E5=86=99=E5=8D=95=E4=BD=8D=EF=BC=8C=E9=A1=B5=E9=9D=A2=E4=B9=9F?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=AD=A3=E5=B8=B8=E6=89=93=E5=BC=80=EF=BC=8C?= =?UTF-8?q?=E8=80=8C=E4=B8=8D=E6=98=AF=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_users.html.erb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb index 6fdb2d9ea..5c6f24524 100644 --- a/app/views/layouts/base_users.html.erb +++ b/app/views/layouts/base_users.html.erb @@ -166,7 +166,11 @@ <% unless @user.user_extensions.nil? %> <% unless @user.user_extensions.identity == 2 %> - <%= l(:field_occupation) %>：<%= @user.user_extensions.school.name %> + <%= l(:field_occupation) %>： + <% unless @user.user_extensions.school.nil? %> + <%= @user.user_extensions.school.name %> + <% end %> + <% end %>