Merge branch 'yuanke' into develop

app/views/admin/code_work_tests.html.erb

@@ -39,6 +39,7 @@
     <% @code_work_tests.each do |test| %>
         <% infos = StudentWorkTest.find_by_sql("select a.homework_common_id as homeworkid,b.language from student_works as a, homework_detail_programings as b where a.id = #{test.student_work_id} and a.homework_common_id = b.homework_common_id
   ").first %>
+        <% if infos != nil %>
             <tr class="<%= cycle("odd", "even") %>">
               <td style="text-align: center; " title='<%=infos.homeworkid%>'>
                 <%=link_to(infos.homeworkid, student_work_index_path(:homework => infos.homeworkid))%>
@@ -87,6 +88,7 @@
               </td>
             </tr>
         <% end %>
+    <% end %>
     </tbody>
   </table>
 </div>