From f41d3f8b6a9115913cbc4a97e80d98dcf566ad16 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 22 Aug 2014 11:24:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=9C=E4=B8=9A=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=9C=9F=E5=AE=9E=E5=90=8D=E5=AD=97=E4=B8=8D=E6=AD=A3?=
 =?UTF-8?q?=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
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 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index e08e50e80..1fd1646b8 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.firstname + user.lastname) : user.login)
+      homework_users = homework_users + (is_teacher ? (user.lastname + user.firstname) : 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 6d3a2adcc..6d1581820 100644
--- a/app/views/bids/_homework_list.html.erb
+++ b/app/views/bids/_homework_list.html.erb
@@ -28,7 +28,7 @@
 		<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 %>
+                <% user_name = is_teacher ? (homework.user.lastname + homework.user.firstname) : homework.user.login %>
                 <tr>
                   <td title="<%= user_name  %>"><%= image_tag(url_to_avatar(homework.user), :class => "avatar")%></td>
                 </tr>