From 41f53ad4e069d90769934c48510b1f691fd673d2 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 5 Nov 2015 16:25:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=88=AA=E6=AD=A2=E5=90=8E?=
 =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E5=86=8D=E4=BF=AE=E6=94=B9=E4=BD=9C=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb                     | 8 +++++---
 app/views/student_work/_programing_work_show.html.erb | 2 +-
 app/views/student_work/_show.html.erb                 | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index b6c4ec91b..5abbddaa1 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2372,10 +2372,12 @@ module ApplicationHelper
             link_to "作品匿评", student_work_index_path(:homework => homework.id), :class => 'c_blue', :title => "开启匿评后不可修改作品"
           elsif homework.homework_detail_manual && homework.homework_detail_manual.comment_status == 3
             link_to "匿评结束", student_work_index_path(:homework => homework.id), :class => 'c_blue', :title => "匿评已结束"
-          elsif homework.homework_type == 2 #编程作业不能修改作品
-            link_to "修改作品(#{homework.student_works.count})",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
+          elsif homework.homework_type == 2 && Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")#编程作业不能修改作品
+            link_to "修改作品(#{homework.student_works.count})", new_student_work_path(:homework => homework.id),:class => 'c_blue'
+          elsif Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
+            link_to "修改作品(#{homework.student_works.count})", edit_student_work_path(work.id),:class => 'c_blue'
           else
-            link_to "修改作品(#{homework.student_works.count})",  edit_student_work_path(work.id),:class => 'c_blue'
+            link_to "查看作品", student_work_index_path(:homework => homework.id), :class => 'c_blue', :title => "作业截止后不可修改作品"
           end
         end
       end
diff --git a/app/views/student_work/_programing_work_show.html.erb b/app/views/student_work/_programing_work_show.html.erb
index dbf7291cb..fd541c643 100644
--- a/app/views/student_work/_programing_work_show.html.erb
+++ b/app/views/student_work/_programing_work_show.html.erb
@@ -6,7 +6,7 @@
       <%=format_time work.created_at %>
     </li>
 
-    <% if work.user == User.current && @homework.homework_detail_manual.comment_status == 1 %>
+    <% if work.user == User.current && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d") %>
         <!-- 我的作业 && 匿评作业 && 未开启匿评，显示编辑和删除按钮 -->
         <li class="fr" >
           <%= link_to("", student_work_path(work),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "pic_del")  %>
diff --git a/app/views/student_work/_show.html.erb b/app/views/student_work/_show.html.erb
index 1f3d44258..286d5eb39 100644
--- a/app/views/student_work/_show.html.erb
+++ b/app/views/student_work/_show.html.erb
@@ -6,7 +6,7 @@
       <%=format_time work.created_at %>
     </li>
 
-    <% if work.user == User.current && @homework.homework_detail_manual.comment_status == 1 %>
+    <% if work.user == User.current && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d") %>
         <!-- 我的作业 && 匿评作业 && 未开启匿评，显示编辑和删除按钮 -->
         <li class="fr" >
           <%= link_to("", student_work_path(work),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "pic_del")  %>