From c4c005a39b59bc8fc46638201b95ee047e7403c5 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Fri, 9 Oct 2015 10:57:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=E6=B6=88=E6=81=AF=E7=9A=84=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E7=AE=97=E6=B3=95=EF=BC=8C=E4=BD=BF=E7=94=A8=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E7=9A=84order?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 5dd23b54c..7d74c0053 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -112,17 +112,10 @@ class UsersController < ApplicationController
     case params[:type]
       when nil
         @message_alls = []
-        system_message_types = MessageAll.where("message_type =?", "SystemMessage").order("created_at desc")
-        messages = MessageAll.where("user_id =? and message_type !=?" ,@user, "SystemMessage").order("created_at desc")
+        messages = MessageAll.where("(user_id =? and message_type !=?) or message_type =?" ,@user, "SystemMessage", "SystemMessage").order("created_at desc")
         messages.each do |message_all|
           @message_alls << message_all.message
         end
-        # 系统消息需要给每个人发送，之所以这样做，可以避免遍历系统所有用户
-        system_message_types.each do |system_message_type|
-          @message_alls << system_message_type.message
-        end
-        # 取出所有符合条件的按照创建时间排序
-        @message_alls = @message_alls.sort {|a,b| b.created_at <=> a.created_at}
       when 'unviewed'
         @message_alls = []
         messages = MessageAll.where("user_id =?", @user).order("created_at desc")

From 97a6487eeb723f29762c41ec30212f83c940106f Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Fri, 9 Oct 2015 10:58:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BC=80=E5=90=AF?=
 =?UTF-8?q?=E5=8C=BF=E8=AF=84=E5=A4=B1=E8=B4=A5=E7=9A=84=E5=8E=9F=E5=9B=A0?=
 =?UTF-8?q?=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_message_course.html.erb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index a95645571..fee28f761 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -191,8 +191,10 @@
           <div style="display: none" class="message_title_red system_message_style">
             <p>
               <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher, ma.course_message.course) ? '老师':'同学'%>您好！
-              <%= User.current.eql?(ma.course_message.user) ?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname + "老师") %>启动作业匿评失败，作业详情如下：
+              <%= User.current.eql?(ma.course_message.user) ?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname + "老师") %>启动作业匿评失败，
+              失败原因：提交作品的人数低于2人
             </p>
+            <p>作业详情如下：</p>
             <p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>
             <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
           </div>