From fa95bf2e9266112ea4f93cb70ee8e2e968585717 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Wed, 31 Jul 2019 17:21:11 +0800 Subject: [PATCH 1/4] b --- public/react/src/modules/tpm/NewHeader.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index 1711f17a..31e6d8db 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -526,9 +526,9 @@ class NewHeader extends Component { } - {/*
  • +
  • 加入项目 -
    • */} + From fa49ca6b1042257835df22a5375f1364e0a1577a Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Thu, 1 Aug 2019 19:08:53 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/managements/evaluate_simple.html.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/managements/evaluate_simple.html.erb b/app/views/managements/evaluate_simple.html.erb index 6d05aedf..ffdf5db0 100644 --- a/app/views/managements/evaluate_simple.html.erb +++ b/app/views/managements/evaluate_simple.html.erb @@ -36,7 +36,8 @@ <%= record.front_js %> <%= record.test_cases %> <%= format_time record.created_at %> - <%= record.shixun.try(:exec_time) %> + <% challenge = Game.find_by(record.game_id).challenge %> + <%= challenge.try(:exec_time) %> <%= record.shixun.try(:identifier) %> <%= link_to record.shixun.try(:name), task_path(record.game), :target => "_blank", :title => "#{record.shixun.try(:name)}" %> From 9e8a54a49b4411517e639db0d1c411b80744e884 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Thu, 1 Aug 2019 19:22:07 +0800 Subject: [PATCH 3/4] 500 --- app/views/managements/evaluate_simple.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/managements/evaluate_simple.html.erb b/app/views/managements/evaluate_simple.html.erb index ffdf5db0..30e8cd39 100644 --- a/app/views/managements/evaluate_simple.html.erb +++ b/app/views/managements/evaluate_simple.html.erb @@ -36,7 +36,7 @@ <%= record.front_js %> <%= record.test_cases %> <%= format_time record.created_at %> - <% challenge = Game.find_by(record.game_id).challenge %> + <% challenge = Game.find(record.game_id).challenge %> <%= challenge.try(:exec_time) %> <%= record.shixun.try(:identifier) %> <%= link_to record.shixun.try(:name), task_path(record.game), :target => "_blank", :title => "#{record.shixun.try(:name)}" %> From 1383460a30807cb63f98288410c27a1a1f29bc6f Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 2 Aug 2019 23:57:29 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?= 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 b0088d44..c93796a0 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -214,7 +214,7 @@ class AccountController < ApplicationController content = "

    [#{params[:question_kind]}]

    " + "

    问题页面网址：#{params[:url]}

    " + params[:description] PrivateMessage.create(:user_id => User.current.id, :target_id => 1, :sender_id => User.current.id, :receiver_id => 1, :content => content, :send_time => Time.now, :status => 1) PrivateMessage.create(:user_id => 1, :target_id => User.current.id, :sender_id => User.current.id, :receiver_id => 1, :content => content, :send_time => Time.now, :status => 0) - redirect_to message_detail_user_path(User.current, :user_id => 1) + redirect_to "/messages/#{User.current.login}/message_detail?target_ids=1" end # 合作伙伴