Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

app/views/courses/code_repeat.html.erb

@@ -28,14 +28,14 @@
           <li class="chabox-w-401 chabox-txt-left" style =" text-align:left; text-indent:1em; " ><%=student_work_name%></li>
           <li><%=student_work.user.show_name%></li>
           <li><%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%> </li>
-          <li class="chabox-r-line"><%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%></li>
+          <li class="chabox-r-line"><%= Time.parse(format_time(student_work.commit_time)).strftime("%m-%d %H:%M")%></li>
           <% if student_work.simi_id.to_i > 0 && @works_hash[student_work.simi_id.to_i] %>
               <% simi_student_work = @works_hash[student_work.simi_id.to_i] %>
               <% simi_student_work_name = simi_student_work.name.nil? || simi_student_work.name.empty? ? simi_student_work.user.show_name + '的作品' : simi_student_work.name%>
               <li class="chabox-w-401 chabox-txt-left" style =" text-align:left; text-indent:1em; " ><%=simi_student_work_name%></li>
               <li><%=simi_student_work.user.show_name%></li>
               <li><%= simi_student_work.user.user_extensions.nil? ? "--" : simi_student_work.user.user_extensions.student_id%></li>
-              <li class="chabox-r-line"><%= Time.parse(format_time(simi_student_work.created_at)).strftime("%m-%d %H:%M")%></li>
+              <li class="chabox-r-line"><%= Time.parse(format_time(simi_student_work.commit_time)).strftime("%m-%d %H:%M")%></li>
               <% if student_work.simi_value.to_i >= 90  %>
                   <li style = "color:red" ><%=student_work.simi_value.to_i%>%</li>
               <% else %>

app/views/student_work/_programing_work_show.html.erb

@@ -3,7 +3,7 @@
       <ul>
         <li class="fl" >
           <span class="tit_fb">上交时间：</span>
-          <%=format_time work.created_at %>
+          <%=format_time work.commit_time %>
           <a href="javascript:void(0);" class="linkBlue mt5 mb5" style="margin-left:165px; width: 24px;" onclick="$('#about_hwork_<%= work.id%>').html('');">收起</a>
         </li>
 

app/views/student_work/_show.html.erb

@@ -12,7 +12,7 @@
     <ul>
       <li class="fl" >
         <span class="tit_fb">上交时间：</span>
-        <%=format_time work.created_at %>
+        <%=format_time work.commit_time %>
       </li>
 
       <% if work.user == User.current && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d") %>