From 35b3993c0c2c14717c09fe1cfa1b1ef72f28dfee Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 27 Jul 2016 14:14:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E6=8F=90=E4=BA=A4=E7=9A=84=E4=BD=9C?=
 =?UTF-8?q?=E5=93=81=E5=8E=BB=E6=8E=89=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/_programing_work_show.html.erb |  2 +-
 app/views/student_work/_show.html.erb                 | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/app/views/student_work/_programing_work_show.html.erb b/app/views/student_work/_programing_work_show.html.erb
index c111fbe48..c4df9e715 100644
--- a/app/views/student_work/_programing_work_show.html.erb
+++ b/app/views/student_work/_programing_work_show.html.erb
@@ -26,7 +26,7 @@
 
         <li >
           <span class="tit_fb ">编程代码：</span>
-          <div class="showHworkP break_word"><pre id="work-src_<%= work.id%>" style="display: none;"><%= work.description ? work.description : "该作品尚未提交相关内容。"%></pre><div class="fontGrey2 font_cus" id="work-code_<%= work.id%>">
+          <div class="showHworkP break_word"><pre id="work-src_<%= work.id%>" style="display: none;"><%= work.description if work.description%></pre><div class="fontGrey2 font_cus" id="work-code_<%= work.id%>">
             </div>
           </div>
           <div class="cl"></div>
diff --git a/app/views/student_work/_show.html.erb b/app/views/student_work/_show.html.erb
index 039baa386..484e8eb0e 100644
--- a/app/views/student_work/_show.html.erb
+++ b/app/views/student_work/_show.html.erb
@@ -59,14 +59,9 @@
 
       <li >
         <span class="tit_fb ">内容：</span>
-        <% com_contents = work.work_status %>
-        <%  if com_contents != 0  && work.description %>
-            <div class="showHworkP break_word upload_img" id="student_work_img_<%= work.id %>">
-              <%= work.description.html_safe %>
-            </div>
-        <% else %>
-            <span style="color: #999999">该作品未在线下完成提交</span>
-        <% end %>
+        <div class="showHworkP break_word upload_img" id="student_work_img_<%=work.id %>">
+          <%= work.description.html_safe if work.description%>
+        </div>
         <div class="cl"></div>
       </li>
       <li >