Merge branch 'develop' into cs_optimize_txz

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>

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 >