From a626f9ce5d2059b3e979386e7d5a8bb56b58d4de Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Fri, 22 Nov 2019 09:21:02 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=A2=9E=E5=88=A0=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/hacks_controller.rb | 24 +++++++++++++++++++++--- app/models/hack_set.rb | 2 ++ config/routes.rb | 2 ++ 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/app/controllers/hacks_controller.rb b/app/controllers/hacks_controller.rb index 915e58882..5c29d7c97 100644 --- a/app/controllers/hacks_controller.rb +++ b/app/controllers/hacks_controller.rb @@ -1,8 +1,8 @@ class HacksController < ApplicationController before_action :require_login, except: [:index] - before_action :require_teacher_identity, only: [:create, :edit, :update] - before_action :require_auth_identity, only: [:update, :edit, :publish] - before_action :find_hack, only: [:edit, :update, :publish, :start] + before_action :require_teacher_identity, only: [:create, :update_set] + before_action :require_auth_identity, only: [:update, :edit, :publish, :update_set, :delete_set] + before_action :find_hack, only: [:edit, :update, :publish, :start, :update_set, :delete_set] # 开启编程，如果第一次开启，创建一条记录，如果已经开启过的话，直接返回标识即可 def start @@ -75,6 +75,20 @@ class HacksController < ApplicationController end end + # 更新测试集接口 + def update_set + set = @hack.hack_sets.find_by(id: params[:id]) + set.update_attributes!(hack_set_params) + render_ok + end + + # 单独删除测试集 + def delete_set + set = @hack.hack_sets.find_by(id: params[:id]) + set.destroy! + render_ok + end + # 发布功能 def publish @hack.update_attribute(:status, 1) @@ -119,6 +133,10 @@ class HacksController < ApplicationController params.permit(hack_sets: [:input, :output, :position])[:hack_sets] end + def hack_set_params + params.require(:hack_set).permit(:id, :input, :output, :position) + end + def hack_code_params params.require(:hack_codes).permit(:code, :language) end diff --git a/app/models/hack_set.rb b/app/models/hack_set.rb index d0518a5b4..669fa10b1 100644 --- a/app/models/hack_set.rb +++ b/app/models/hack_set.rb @@ -1,4 +1,6 @@ class HackSet < ApplicationRecord + validates :input, presence: { message: "测试集输入不能为空" } + validates :output, uniqueness: { message: "测试集输出不能为空" } # 编程题测试集 belongs_to :hack end diff --git a/config/routes.rb b/config/routes.rb index 81c419a7e..19500a235 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -43,6 +43,8 @@ Rails.application.routes.draw do post :publish get :start get :result + post :update_set + delete :delete_set end resources :comments do From 3fb77abb5b14c4c4be7695cae4257a58f0cc75f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 22 Nov 2019 09:45:29 +0800 Subject: [PATCH 2/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 --- .../react/src/modules/courses/coursesPublic/Newshixunmodel.css | 1 + 1 file changed, 1 insertion(+) diff --git a/public/react/src/modules/courses/coursesPublic/Newshixunmodel.css b/public/react/src/modules/courses/coursesPublic/Newshixunmodel.css index 82e46d489..e80556bb0 100644 --- a/public/react/src/modules/courses/coursesPublic/Newshixunmodel.css +++ b/public/react/src/modules/courses/coursesPublic/Newshixunmodel.css @@ -5,6 +5,7 @@ .newshixunheadersear{ display: flex; justify-content: center; + margin: 0 auto; } .packinput .ant-input{ height: 55px; From 92670dd1e46bd4e298757555e6ecf6b793678392 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 22 Nov 2019 09:51:50 +0800 Subject: [PATCH 3/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 --- .../src/modules/courses/coursesPublic/NewShixunModel.js | 2 +- .../src/modules/courses/coursesPublic/Newshixunmodel.css | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/coursesPublic/NewShixunModel.js b/public/react/src/modules/courses/coursesPublic/NewShixunModel.js index 5fe9c8aa0..99a8ad232 100644 --- a/public/react/src/modules/courses/coursesPublic/NewShixunModel.js +++ b/public/react/src/modules/courses/coursesPublic/NewShixunModel.js @@ -616,7 +616,7 @@ class NewShixunModel extends Component{ } - {shixun_list===undefined||shixuns_count===undefined?"":shixun_list.length===0||shixuns_count===0?"":shixuns_count>15?
+ {shixun_list===undefined||shixuns_count===undefined?"":shixun_list.length===0||shixuns_count===0?"":shixuns_count>15?
Date: Fri, 22 Nov 2019 09:59:01 +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 --- public/react/src/modules/user/AccountPhoneemail.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/user/AccountPhoneemail.js b/public/react/src/modules/user/AccountPhoneemail.js index cab70205d..a589d780a 100644 --- a/public/react/src/modules/user/AccountPhoneemail.js +++ b/public/react/src/modules/user/AccountPhoneemail.js @@ -65,7 +65,7 @@ class AccountPhoneemail extends Component { width="530px" >
-

您需要完成手机号码和邮箱的绑定，才能使用此功能

+

您需要完成手机号码或者邮箱的绑定，才能使用此功能

this.gotoback()}>稍后绑定 {'立即绑定'}