From 37bffb3baaabd3f9e27ecac770b9043bbcc484cc 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, 6 Sep 2019 19:51:03 +0800 Subject: [PATCH 1/5] =?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/usersInfo/banks/GtaskBanksEdit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/user/usersInfo/banks/GtaskBanksEdit.js b/public/react/src/modules/user/usersInfo/banks/GtaskBanksEdit.js index 16ecea151..d7e433de3 100644 --- a/public/react/src/modules/user/usersInfo/banks/GtaskBanksEdit.js +++ b/public/react/src/modules/user/usersInfo/banks/GtaskBanksEdit.js @@ -59,7 +59,7 @@ class GtaskBanksEdit extends Component { }); } toWorkDetail = () => { - this.props.history.push(`/banks/gtask/${this.props.match.params.workId}/${this.props.match.params.type}?tab=0`); + window.location.href=`/banks/gtask/${this.props.match.params.workId}/${this.props.match.params.type}?tab=0`; this.props.initPublic(undefined); } onCancel = () => { From c41e85f51f6c457258d71aa82e32846e3de0f24c Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 6 Sep 2019 19:54:56 +0800 Subject: [PATCH 2/5] tiaoz --- app/views/task_banks/show.json.jbuilder | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/task_banks/show.json.jbuilder b/app/views/task_banks/show.json.jbuilder index b929fafd8..ab53399e1 100644 --- a/app/views/task_banks/show.json.jbuilder +++ b/app/views/task_banks/show.json.jbuilder @@ -1,5 +1,6 @@ json.(@bank, :id, :name, :description, :task_type, :is_public) # 附件 +json.authorize @bank.user_id == current_user.id || current_user.admin? json.attachments @bank_attachments do |attachment| json.partial! "attachments/attachment_simple", locals: {attachment: attachment} end From aa0724414c0fdac468e6864ec0cbf4f550663629 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, 6 Sep 2019 19:58:58 +0800 Subject: [PATCH 3/5] =?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/user/usersInfo/banks/NewGtaskForm.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/public/react/src/modules/user/usersInfo/banks/NewGtaskForm.js b/public/react/src/modules/user/usersInfo/banks/NewGtaskForm.js index 16f77ad46..157ab76cf 100644 --- a/public/react/src/modules/user/usersInfo/banks/NewGtaskForm.js +++ b/public/react/src/modules/user/usersInfo/banks/NewGtaskForm.js @@ -110,8 +110,7 @@ class NewGtaskForms extends Component{ } handleSubmit = () => { - debugger - + e.preventDefault(); let {contentFileList,min_num,max_num,base_on_project}=this.state; let {data}=this.props; let task_type=data.task_type @@ -220,7 +219,7 @@ class NewGtaskForms extends Component{ ` } -
+
{this.props.data&&this.props.data.task_type===1?"普通作业":this.props.data&&this.props.data.task_type===2?"分组作业":""} @@ -340,7 +339,7 @@ class NewGtaskForms extends Component{
{/* htmlType="submit" */} - + this.props.onCancel()}>取消
From d35eb5ae146b4b8f3c72b98dbaccb5d1aa8c99de 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, 6 Sep 2019 19:59:12 +0800 Subject: [PATCH 4/5] =?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/usersInfo/banks/NewGtaskForm.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/user/usersInfo/banks/NewGtaskForm.js b/public/react/src/modules/user/usersInfo/banks/NewGtaskForm.js index 157ab76cf..9ec52f6f4 100644 --- a/public/react/src/modules/user/usersInfo/banks/NewGtaskForm.js +++ b/public/react/src/modules/user/usersInfo/banks/NewGtaskForm.js @@ -110,7 +110,7 @@ class NewGtaskForms extends Component{ } handleSubmit = () => { - e.preventDefault(); + let {contentFileList,min_num,max_num,base_on_project}=this.state; let {data}=this.props; let task_type=data.task_type From 6e5a0a747d15d40a72ef77201af74d00e7d3d5ae Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 6 Sep 2019 20:01:02 +0800 Subject: [PATCH 5/5] =?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/task_banks_controller.rb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/controllers/task_banks_controller.rb b/app/controllers/task_banks_controller.rb index 8d17c15f1..3aa01bb23 100644 --- a/app/controllers/task_banks_controller.rb +++ b/app/controllers/task_banks_controller.rb @@ -33,16 +33,16 @@ class TaskBanksController < ApplicationController end def gtask_bank_params - tip_exception("name参数不能为空") if params[:gtask_bank][:name].blank? - tip_exception("description参数不能为空") if params[:gtask_bank][:description].blank? + tip_exception("name参数不能为空") if params[:task_bank][:name].blank? + tip_exception("description参数不能为空") if params[:task_bank][:description].blank? if @bank.task_type == 2 - tip_exception("base_on_project参数不能为空") if params[:gtask_bank][:base_on_project].nil? - tip_exception("min_num参数不能为空") if params[:gtask_bank][:min_num].blank? - tip_exception("max_num参数不能为空") if params[:gtask_bank][:max_num].blank? - tip_exception("最小人数不能小于1") if params[:gtask_bank][:min_num].to_i < 1 - tip_exception("最大人数不能小于最小人数") if params[:gtask_bank][:max_num].to_i < params[:gtask_bank][:min_num].to_i + tip_exception("base_on_project参数不能为空") if params[:task_bank][:base_on_project].nil? + tip_exception("min_num参数不能为空") if params[:task_bank][:min_num].blank? + tip_exception("max_num参数不能为空") if params[:task_bank][:max_num].blank? + tip_exception("最小人数不能小于1") if params[:task_bank][:min_num].to_i < 1 + tip_exception("最大人数不能小于最小人数") if params[:task_bank][:max_num].to_i < params[:gtask_bank][:min_num].to_i end - params.require(:gtask_bank).permit(:name, :description) if @bank.task_type == 1 - params.require(:gtask_bank).permit(:name, :description, :min_num, :max_num, :base_on_project) if @bank.task_type == 2 + params.require(:task_bank).permit(:name, :description) if @bank.task_type == 1 + params.require(:task_bank).permit(:name, :description, :min_num, :max_num, :base_on_project) if @bank.task_type == 2 end end