From 6c7237509d8a3bc447d8a443c2339f156923292e Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 13 Jun 2016 14:08:30 +0800
Subject: [PATCH] =?UTF-8?q?=E2=80=9C=E5=BD=93=E5=89=8D=E4=BD=9C=E5=93=81?=
 =?UTF-8?q?=E6=9C=AA=E8=BF=9B=E8=A1=8C=E8=AF=84=E5=88=86=EF=BC=8C=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E7=A1=AE=E5=AE=9A=E6=8F=90=E4=BA=A4=E2=80=9D=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E2=80=9C=E6=82=A8=E5=BD=93=E6=AC=A1=E8=AF=84=E9=98=85?=
 =?UTF-8?q?=E6=9C=AA=E5=AF=B9=E4=BD=9C=E5=93=81=E8=BF=9B=E8=A1=8C=E8=AF=84?=
 =?UTF-8?q?=E5=88=86=EF=BC=8C=E5=88=86=E6=95=B0=E5=B0=86=E5=8F=96=E4=B8=8A?=
 =?UTF-8?q?=E6=AC=A1=E7=9A=84=E8=AF=84=E5=88=86=E7=BB=93=E6=9E=9C=EF=BC=8C?=
 =?UTF-8?q?=E8=8B=A5=E6=B2=A1=E6=9C=89=E8=AF=84=E5=88=86=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=88=99=E4=B8=8D=E8=AF=84=E5=88=86=EF=BC=8C=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E7=A1=AE=E5=AE=9A=E6=8F=90=E4=BA=A4=EF=BC=9F=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/_no_teacher_score_notice.html.erb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/student_work/_no_teacher_score_notice.html.erb b/app/views/student_work/_no_teacher_score_notice.html.erb
index 5a8c768cc..0926e3c74 100644
--- a/app/views/student_work/_no_teacher_score_notice.html.erb
+++ b/app/views/student_work/_no_teacher_score_notice.html.erb
@@ -1,7 +1,8 @@
 <div id="popbox02">
   <div class="ni_con">
     <p>
-      当前作品未进行评分，是否确定提交？
+      <%#A if work.teacher_score.nil? || work. %>
+      您当次评阅未对作品进行评分，分数将取上次的评分结果，若没有评分记录则不评分，是否确定提交？
     </p>
     <div class="ni_btn">
       <a href="javascript:" class="tijiao" onclick="submit_teacher_score(<%=work.id %>);" style="margin-bottom: 20px;" >