Merge branch 'yuanke' into develop

app/views/student_work/_programing_work_show.html.erb

@@ -55,8 +55,8 @@
                   <ul class="ProResultUl " >
 
                     <% test.results.reverse.each_with_index do |x, i| %>
+                      <% unless x.nil? %>
                         <li >
-
                           <span class="w60 T_C">测试<%=test.results.size-i%></span>
                           <% if x["status"].to_i != 0 %>
                               <% if x["status"].to_i == 2 %>
@@ -82,6 +82,7 @@
                               <div class="cl"></div>
                           <% end %>
                         </li>
+                      <% end %>
                     <% end %>
                   </ul>
                 </div>

app/views/users/new_user_commit_homework.html.erb

@@ -30,7 +30,7 @@
                 <! if(results["status"]==2){!>
                     <span class="w60 c_red">超时！</span>
                 <!}else{!>
-                <span class="w60 c_red">测试错误！</span>
+                    <span class="w60 c_red">测试错误！</span>
                 <!}!>
                 <span class="w60">您的输出：</span>
                 <span class="w180"><pre style="white-space: pre-wrap; margin-right: 15px;"><!=results["result"]!> </pre></span>
@@ -133,7 +133,9 @@
           <% else %>
             <div class="ProResultTable " >
               <ul class="ProResultUl " >
-                <% test.results.reverse.each_with_index do |x, i| %>
+              <% logger.error("################################################{test.results}") %>
+              <% test.results.reverse.each_with_index do |x, i| %>
+                <% unless x.nil? %>
                   <li ><span class="w60 T_C">测试<%=test.results.size-i%></span>
                   <% if x["status"].to_i != 0 %>
                     <% if x["status"].to_i == 2 %>
@@ -159,6 +161,7 @@
                   </li>
                   <% end %>
                 <% end %>
+              <% end %>
              </ul>
             </div>
           <% end %>

app/views/users/user_commit_homework.html.erb

@@ -101,6 +101,7 @@
             <div class="ProResultTable " >
               <ul class="ProResultUl " >
                 <% test.results.reverse.each_with_index do |x, i| %>
+                <% unless x.nil? %>
                   <li ><span class="w60 T_C">测试<%=test.results.size-i%></span>
                   <% if x["status"].to_i != 0 %>
                     <% if x["status"].to_i == 2 %>
@@ -125,6 +126,7 @@
                     <div class="cl"></div>
                   </li>
                   <% end %>
+                 <% end %>
                 <% end %>
              </ul>
             </div>

public/javascripts/homework.js

@@ -97,8 +97,8 @@ $(function(){
                         alert("您的答案超时了, 请检查代码是否存在死循环的错误.");
                     } else {
                         alert("测试失败,服务器出错.");
-                        return;
                     }
+                    return;
                 });
         };