From bf1333ece9f1cba9d0397b4cd3259b107ab25d4f Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Fri, 6 Nov 2015 16:11:12 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=99=BB=E9=99=86=E9=80=80=E5=87=BA?= =?UTF-8?q?=E5=81=B6=E5=B0=94=E6=8A=A5500?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/account_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index af501fdf9..b71220df1 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -21,7 +21,7 @@ class AccountController < ApplicationController # prevents login action to be filtered by check_if_login_required application scope filter skip_before_filter :check_if_login_required - + protect_from_forgery :except => [:login,:logout] # Login request and validation def login if request.get? From 7aff7bc20b98c54dbf8f06b384f1f89c8d3105e4 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Fri, 6 Nov 2015 16:32:19 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=9B=9E=E9=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/account_controller.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index b71220df1..33d988e35 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -21,7 +21,6 @@ class AccountController < ApplicationController # prevents login action to be filtered by check_if_login_required application scope filter skip_before_filter :check_if_login_required - protect_from_forgery :except => [:login,:logout] # Login request and validation def login if request.get? From 1e33e38fe2b76708ef47f1fdd1e0b767e623a4ed Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Fri, 6 Nov 2015 16:34:37 +0800 Subject: [PATCH 3/4] =?UTF-8?q?token=E4=B8=8D=E5=AF=B9=E7=9A=84=E8=AF=9D?= =?UTF-8?q?=EF=BC=8C=E9=82=A3=E5=B0=B1=E8=B7=B3=E8=BD=AC=E5=88=B0=E7=99=BB?= =?UTF-8?q?=E9=99=86=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/application_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index bb2138062..6387a97a4 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -663,7 +663,8 @@ class ApplicationController < ActionController::Base if api_request? logger.error "Form authenticity token is missing or is invalid. API calls must include a proper Content-type header (text/xml or text/json)." end - render_error "Invalid form authenticity token." + #render_error "Invalid form authenticity token." + redirect_to signin_path(:login=>true) end def render_feed(items, options={}) From 3cc9fbe6934b330c4570cc7e70320a33ba67d5cb Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Fri, 6 Nov 2015 16:44:46 +0800 Subject: [PATCH 4/4] =?UTF-8?q?24=E7=82=B9=E6=94=B9=E4=B8=BA=2023:59?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_message_course.html.erb | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb index b05afc63b..41c7c1eee 100644 --- a/app/views/users/_user_message_course.html.erb +++ b/app/views/users/_user_message_course.html.erb @@ -66,9 +66,9 @@
  • 课程名称：<%= ma.course_message.course.name %> (<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)
  • 作业标题：<%= ma.course_message.name %>
    • -
  • 提交截止：<%= ma.course_message.end_time %>  24点
    • -
  • 匿评开始：<%= ma.course_message.homework_detail_manual.evaluation_start %>  24点
    • -
  • 匿评关闭：<%= ma.course_message.homework_detail_manual.evaluation_end %>  24点
    • +
  • 提交截止：<%= ma.course_message.end_time %>  23:59
    • +
  • 匿评开始：<%= ma.course_message.homework_detail_manual.evaluation_start %>  23:59
    • +
  • 匿评关闭：<%= ma.course_message.homework_detail_manual.evaluation_end %>  23:59
  • 迟交扣分：<%= ma.course_message.late_penalty %>分
  • 缺评扣分：<%= ma.course_message.homework_detail_manual.absence_penalty %>分
    • @@ -81,9 +81,9 @@
  • 课程名称：<%= ma.course_message.course.name %> (<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)
  • 作业标题：<%= ma.course_message.name %>
    • -
  • 提交截止：<%= ma.course_message.end_time %>  24点
    • -
  • 匿评开始：<%= ma.course_message.homework_detail_manual.evaluation_start %>  24点
    • -
  • 匿评关闭：<%= ma.course_message.homework_detail_manual.evaluation_end %>  24点
    • +
  • 提交截止：<%= ma.course_message.end_time %>  23:59
    • +
  • 匿评开始：<%= ma.course_message.homework_detail_manual.evaluation_start %>  23:59
    • +
  • 匿评关闭：<%= ma.course_message.homework_detail_manual.evaluation_end %>  23:59
  • 迟交扣分：<%= ma.course_message.late_penalty %>分
  • 缺评扣分：<%= ma.course_message.homework_detail_manual.absence_penalty %>分
    • @@ -116,9 +116,9 @@ <% unless User.current.allowed_to?(:as_teacher, ma.course_message.course)%>

    请您尽早完成匿评！如果您在截止日期前未完成匿评，您的最终成绩将被扣除<%= ma.course_message.homework_detail_manual.absence_penalty %>分乘以缺评份数。

    @@ -215,7 +215,7 @@
  • 失败原因：提交作品的人数低于2人
  • 课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年' + ma.course_message.course.term %>)
  • 作业标题：<%= ma.course_message.name %>
    • -
  • 提交截止：<%= ma.course_message.end_time%>  24点
    • +
  • 提交截止：<%= ma.course_message.end_time%>  23:59
  • <%= time_tag(ma.created_at).html_safe %>
    • @@ -314,7 +314,7 @@ <% end %>

    - 本次作业将在<%= ma.course_message.student_work.homework_common.homework_detail_manual.evaluation_end %>  24点结束匿评，到时您将可以看到所有其他同学的作品啦！大家可以进一步互相学习。 期待您取得更大的进步！ + 本次作业将在<%= ma.course_message.student_work.homework_common.homework_detail_manual.evaluation_end %>  23:59结束匿评，到时您将可以看到所有其他同学的作品啦！大家可以进一步互相学习。 期待您取得更大的进步！

    <% end %> @@ -397,7 +397,7 @@