From 6566a044d2a42ba86bbe5408ce3a9a9aabecf933 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 15 May 2015 15:38:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E5=B7=A5=E4=BD=9C=E5=9C=B0=E7=82=B9?=
 =?UTF-8?q?=E5=B0=B1=E4=B8=8D=E6=98=BE=E7=A4=BA=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_users.html.erb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb
index 651067475..1f74ccd5d 100644
--- a/app/views/layouts/base_users.html.erb
+++ b/app/views/layouts/base_users.html.erb
@@ -68,7 +68,7 @@
                                 </tr>
                                 <tr>
                                     <td>
-                                        <%=link_to l(:field_homepage), home_path %> >                                    
+                                        <%=link_to l(:field_homepage), home_path %> >
                                         <span>
                                           <%=link_to @user.name, user_path %>
                                         </span>
@@ -122,7 +122,7 @@
 											<strong class="font_small_watch">
                                               <%= link_to l(:label_user_watcher)+"("+User.watched_by(@user.id).count.to_s+")" ,:controller=>"users", :action=>"user_watchlist"%>
                                             </strong> &nbsp;
-											
+
 											<strong class="font_small_watch">
                                               <%= link_to l(:label_x_user_fans, :count => User.current.watcher_users(User.current.id).count)+"("+@user.watcher_users.count.to_s+")", :controller=>"users", :action=>"user_fanslist" %>
                                             </strong>&nbsp;&nbsp;
@@ -190,16 +190,16 @@
 											<% unless @user.user_extensions.nil? %>
                                                 <% if @user.user_extensions.identity == 0 || @user.user_extensions.identity == 1 %>
                                                 <tr>
+                                                  <% unless @user.user_extensions.school.nil? %>
                                                     <td style=" float: right" width="70px">
                                                       <span style="float: right"><%= l(:field_occupation) %>：</span>
                                                     </td>
                                                     <td class="font_lighter_sidebar" style="padding-left: 0px" width="170px">
-                                                        <% unless @user.user_extensions.school.nil? %>
                                                         <a href="http://course.trustie.net/?school_id=<%= @user.user_extensions.school.id%>"><%= @user.user_extensions.school.name  %></a>
-                                                        <% end %>
                                                     </td>
+                                                  <% end %>
                                                 </tr>
-                                                  <% elsif @user.user_extensions.identity == 3 %>
+                                                  <% elsif @user.user_extensions.identity == 3 && @user.user_extensions.occupation.empty? %>
                                                   <tr>
                                                     <td style=" float: right" width="70px">
                                                      <span style="float: right"> <%= l(:field_occupation) %>：</span>