From 50e1f413459afee5ee458e3a5ab17f7adcfc96b6 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 21 Aug 2014 11:16:40 +0800
Subject: [PATCH] =?UTF-8?q?#1307=E4=BF=AE=E5=A4=8D=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9C=9F=E5=AE=9E=E5=A7=93=E5=90=8D=E5=8F=AA?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=90=8D=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=A7=93?=
 =?UTF-8?q?=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/courses_helper.rb          | 2 +-
 app/views/bids/_homework_list.html.erb | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index aad350d22..e08e50e80 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -441,7 +441,7 @@ module CoursesHelper
   def homework_user_of_homework homework,is_teacher
     homework_users = ""
     homework.users.each do |user|
-      homework_users = homework_users + (is_teacher ? user.realname : user.name)
+      homework_users = homework_users + (is_teacher ? (user.firstname + user.lastname) : user.login)
       if user != homework.users.last
         homework_users = homework_users + "、"
       end
diff --git a/app/views/bids/_homework_list.html.erb b/app/views/bids/_homework_list.html.erb
index 6797bc9eb..6d3a2adcc 100644
--- a/app/views/bids/_homework_list.html.erb
+++ b/app/views/bids/_homework_list.html.erb
@@ -28,13 +28,15 @@
 		<tr>
 			<td style="vertical-align: top;width: 70px" >
               <table style="text-align: center;width: 100%;table-layout: fixed">
+                <% user_name = is_teacher ? (homework.user.firstname + homework.user.lastname) : homework.user.login %>
                 <tr>
-                  <td title="<%= homework.user.name  %>"><%= image_tag(url_to_avatar(homework.user), :class => "avatar")%></td>
+                  <td title="<%= user_name  %>"><%= image_tag(url_to_avatar(homework.user), :class => "avatar")%></td>
                 </tr>
                 <tr>
-                  <td title="<%= homework.user.name  %>">
+
+                  <td title="<%= user_name  %>">
                     <p style="width: 100%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"><strong>
-                      <%= link_to (is_teacher ? homework.user.realname : homework.user ), user_path(homework.user),{:style => "color:#727272"} %>
+                      <%= link_to user_name, user_path(homework.user),{:style => "color:#727272"} %>
                     </strong></p>
                   </td>
                 </tr>