From 2a8e40603c6badbdf4cf7a08c0c0432fdbd0fa92 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 6 Nov 2014 16:05:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E5=BC=B9=E5=87=BA=E6=A1=86=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/homework_attach/show.js.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/homework_attach/show.js.erb b/app/views/homework_attach/show.js.erb
index f22c5d149..d63b5fb8f 100644
--- a/app/views/homework_attach/show.js.erb
+++ b/app/views/homework_attach/show.js.erb
@@ -2,7 +2,7 @@ $('#ajax-modal').html('<%= escape_javascript(render :partial => 'show',:locals =
 showModal('ajax-modal', '513px');
 $('#ajax-modal').css('height','569px');
 $('#ajax-modal').siblings().remove();
-$('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+$('#ajax-modal').before("<span style='float: right;cursor:pointer;padding-left: 513px;'>" +
         "<a href='#' onclick='hidden_homework_atert_form("+
         <%= @cur_page%> + "," + <%= @cur_type%> +
         ");'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");

From 6c13a682c0774d4cc8cfe1be7dce739bcdcd071e Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 6 Nov 2014 16:37:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=84=E5=88=86?=
 =?UTF-8?q?=E4=B8=BAnil=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/homework_attach/_homework.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/homework_attach/_homework.html.erb b/app/views/homework_attach/_homework.html.erb
index 0fb865884..f4ed0a9f2 100644
--- a/app/views/homework_attach/_homework.html.erb
+++ b/app/views/homework_attach/_homework.html.erb
@@ -35,7 +35,7 @@
 <li class="wscore">
   <%= is_student_batch_homework ? l(:label_my_score) : l(:label_student_score)%>:
   <span class="c_red">
-    <%= homework.s_score.nil? ? l(:label_without_score) : format("%.2f",(is_student_batch_homework ? homework.m_score : homework.s_score)) %>
+    <%= homework.s_score.nil? ? l(:label_without_score) : format("%.2f",(is_student_batch_homework ? (homework.m_score.nil? ? 0 : homework.m_score) : (homework.s_score.nil? ? 0 : homework.s_score))) %>
   </span>
 </li>
 <% if is_teacher %>