From e89cb99743e1d8fa8984aa68474ac68964b103b3 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 24 Nov 2015 16:20:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=A6=E7=94=9F=E6=B5=8B?=
 =?UTF-8?q?=E9=AA=8C=E7=BB=93=E6=9E=9C=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=89=B9?=
 =?UTF-8?q?=E6=AC=A1=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/exercise_controller.rb            | 2 +-
 app/views/exercise/student_exercise_list.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb
index d53dc067c..1598030a2 100644
--- a/app/controllers/exercise_controller.rb
+++ b/app/controllers/exercise_controller.rb
@@ -328,7 +328,7 @@ class ExerciseController < ApplicationController
   def student_exercise_list
     @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
     @exercise = Exercise.find params[:id]
-    @all_exercises = @course.exercises.order("created_at desc")
+    @all_exercises = @course.exercises.where("exercise_status > 1").order("created_at desc")
     @exercise_count = @exercise.exercise_users.where('score is not NULL').count
     if @is_teacher || (!@exercise.exercise_users.where(:user_id => User.current.id).empty? && Time.parse(@exercise.end_time.to_s).strftime("%Y-%m-%d-%H-%M-%S") <= Time.now.strftime("%Y-%m-%d-%H-%M-%S"))
       @exercise_users_list = @exercise.exercise_users.where('score is not NULL')
diff --git a/app/views/exercise/student_exercise_list.html.erb b/app/views/exercise/student_exercise_list.html.erb
index 8653836ca..2e51d61af 100644
--- a/app/views/exercise/student_exercise_list.html.erb
+++ b/app/views/exercise/student_exercise_list.html.erb
@@ -73,7 +73,7 @@
             <ul>
               <% @all_exercises.each_with_index do |exercise,index |%>
                   <li class="pr10">
-                    <%= link_to "作业#{@all_exercises.count - index}：#{exercise.exercise_name}",''%>
+                    <%= link_to "测验#{@all_exercises.count - index}：#{exercise.exercise_name}",student_exercise_list_exercise_path(exercise.id,:course_id => @course.id)%>
                     <%#= link_to "第#{@homework_commons.count - index}次作业",student_work_index_path(:homework => homework_common.id)%>
                   </li>
               <% end%>