From 5f41e191b18f75f2d86dbfa8d019bff2ad47ee87 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 5 Jul 2016 10:06:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E6=B5=8B=E9=AA=8C=E7=9A=84?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?=
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_form.html.erb | 4 ++--
 config/locales/zh.yml                      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb
index e4f637b6d..c3964c567 100644
--- a/app/controllers/exercise_controller.rb
+++ b/app/controllers/exercise_controller.rb
@@ -511,7 +511,7 @@ class ExerciseController < ApplicationController
   def commit_exercise
     # 老师不需要提交
     if User.current.allowed_to?(:as_teacher,@course)
-      if @exercise.publish_time.nil?
+      if @exercise.publish_time.nil? || @exercise.publish_time <= Time.now
         @exercise.update_attributes(:show_result => params[:show_result])
         @exercise.update_attributes(:exercise_status => 2)
         @exercise.update_attributes(:publish_time => Time.now)
diff --git a/app/views/exercise/_exercise_form.html.erb b/app/views/exercise/_exercise_form.html.erb
index 176b7ac04..9d70511e8 100644
--- a/app/views/exercise/_exercise_form.html.erb
+++ b/app/views/exercise/_exercise_form.html.erb
@@ -145,11 +145,11 @@
             alert("测验标题不能为空");
         } else if($.trim($("#exercise_end_time").val()) =="") {
             alert("截止时间不能为空");
-        } else if((Date.parse($("#exercise_end_time").val())+(24*60*60-1)*1000) < Date.now()) {
+        } else if((Date.parse($("#exercise_end_time").val())+(24*60*60-1)*1000) <= Date.now()) {
             alert("截止时间不能小于当前时间");
         } else if($.trim($("#exercise_time").val()) !="" && !/^[1-9][0-9]*$/.test($.trim($("#exercise_time").val()))) {
             alert("测验时长必须为非零开头的数字");
-        } else if($.trim($("#exercise_publish_time").val()) !="" && Date.parse($("#exercise_publish_time").val()) > Date.now()) {
+        } else if($.trim($("#exercise_publish_time").val()) !="" && ((Date.parse($("#exercise_publish_time").val())+(24*60*60-1)*1000) < Date.now())) {
             alert("发布时间不能小于当前时间");
         } else if($.trim($("#exercise_publish_time").val()) !="" && Date.parse($("#exercise_end_time").val()) < Date.parse($("#exercise_publish_time").val())) {
             alert("截止时间不能小于发布时间");
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 3dbd2e8ef..2c6da087d 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1139,7 +1139,7 @@ zh:
   text_account_destroy_confirmation: |-
     确定继续处理？
     您的账号一旦删除，将无法再次激活使用。
-  error_session_expired: 您的会话已过期。请重新登陆。
+  error_session_expired: 您的会话已过期。请重新登录。
   text_session_expiration_settings: "警告： 更改这些设置将会使包括你在内的当前会话失效。"
   setting_session_lifetime: 会话最大有效时间
   setting_session_timeout: 会话闲置超时