From 0215e5e38c6a10d21ce7f83c07a2e2e7b98b672a Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 15 Dec 2015 15:37:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8B=A5=E6=B5=8B=E9=AA=8C=E5=B7=B2=E6=88=AA?=
 =?UTF-8?q?=E6=AD=A2=E4=B8=94=E5=AD=A6=E7=94=9F=E5=B7=B2=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E5=88=99=E5=9C=A8=E6=B5=8B=E9=AA=8C=E5=88=97=E8=A1=A8=E5=90=8E?=
 =?UTF-8?q?=E9=9D=A2=E6=98=BE=E7=A4=BA=E2=80=9C=E5=B7=B2=E7=AD=94=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb
index 17efa6f89..0eeffa588 100644
--- a/app/controllers/exercise_controller.rb
+++ b/app/controllers/exercise_controller.rb
@@ -27,7 +27,7 @@ class ExerciseController < ApplicationController
     if @is_teacher || User.current.admin?
       exercises = @course.exercises.order("created_at asc")
     else
-      exercises = @course.exercises.where("exercise_status <> 1 ").order("created_at asc")
+      exercises = @course.exercises.where("exercise_status <> 1").order("created_at asc")
     end
     @exercises = paginateHelper exercises,20 #分页
     respond_to do |format|
diff --git a/app/views/exercise/_exercise.html.erb b/app/views/exercise/_exercise.html.erb
index 30f986d92..19bc520d4 100644
--- a/app/views/exercise/_exercise.html.erb
+++ b/app/views/exercise/_exercise.html.erb
@@ -56,7 +56,10 @@
             <!--li><%#= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_st fl c_dblue" %></li>
             <li class="pollsbtn_tip fl ml5">已答</li-->
         <%#else%>
-            <%= link_to (index.to_i+1).to_s+". "+exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_st fl c_dblue"%>
+        <%= link_to (index.to_i+1).to_s+". "+exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_st fl c_dblue"%>
+        <% if exercise.end_time <= Time.now && has_commit_exercise?(exercise.id, User.current.id) %>
+            <li class="pollsbtn_tip fl ml5">已答</li>
+        <% end %>
         <%#end%>
     <% end%>
     <li class="polls_date fr mr10">截止时间：<%= format_time(exercise.end_time.to_s)%></li>