From 09a994f76a49d33f4f6b2c97c97b6eca0f38ce5a Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 29 Aug 2015 18:54:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=8C=E7=A7=B0=E5=A2=9E=E5=8A=A0=E5=89=AF?=
 =?UTF-8?q?=E6=95=99=E6=8E=88=E7=AD=89=E8=81=8C=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb        | 6 +++---
 app/views/layouts/new_base_user.html.erb | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index b36a6491e..7b83bb1c2 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2254,11 +2254,11 @@ module ApplicationHelper
     technical_title
   end
 
-  def get_user_roll identity
+  def get_user_roll user
     technical_title = ""
-    case identity.to_s
+    case user.user_extensions.identity.to_s
       when "0"
-        technical_title =  l(:label_account_identity_teacher)
+        technical_title =  get_technical_title user
       when "1"
         technical_title =  l(:label_account_identity_student)
       when "2"
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 6fe2a4653..20a626c12 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -52,7 +52,7 @@
           <div class="cl"></div>
           <% if @user.user_extensions && @user.user_extensions.identity %>
               <p class="mb20 c_dark f14">
-                <%= get_user_roll @user.user_extensions.identity %>
+                <%= get_user_roll @user %>
               </p>
           <% end%>
           <div id="watch_user_btn_div">