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 1/3] =?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 From 163448435ea657c9abed59ea27dd5e53aef7f610 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Fri, 6 Sep 2019 20:02:58 +0800 Subject: [PATCH 2/3] 1 --- app/controllers/task_banks_controller.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/controllers/task_banks_controller.rb b/app/controllers/task_banks_controller.rb index 8d17c15f1..82ce14b0c 100644 --- a/app/controllers/task_banks_controller.rb +++ b/app/controllers/task_banks_controller.rb @@ -12,7 +12,7 @@ class TaskBanksController < ApplicationController ActiveRecord::Base.transaction do begin @bank.update_attributes(gtask_bank_params) - Attachment.associate_container(params[:attachment_ids], @bank.id, @bank.class) if params[:attachment_ids] + Attachment.associate_container(params[:attachment_ids], @bank.id, @bank.class) if params[:attachment_ids].blank? normal_status(0, "更新成功") rescue Exception => e uid_logger(e.message) @@ -42,7 +42,10 @@ class TaskBanksController < ApplicationController 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 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 + if @bank.task_type == 1 + params.require(:gtask_bank).permit(:name, :description) + else + params.require(:gtask_bank).permit(:name, :description, :min_num, :max_num, :base_on_project) + end end end From de05cfd7f5ad375dc2b0c03c0d6a82c0b39aecce Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Fri, 6 Sep 2019 20:05:26 +0800 Subject: [PATCH 3/3] 1 --- app/controllers/task_banks_controller.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/controllers/task_banks_controller.rb b/app/controllers/task_banks_controller.rb index 9b20e42ed..82ce14b0c 100644 --- a/app/controllers/task_banks_controller.rb +++ b/app/controllers/task_banks_controller.rb @@ -33,14 +33,14 @@ class TaskBanksController < ApplicationController end def gtask_bank_params - tip_exception("name参数不能为空") if params[:task_bank][:name].blank? - tip_exception("description参数不能为空") if params[:task_bank][:description].blank? + tip_exception("name参数不能为空") if params[:gtask_bank][:name].blank? + tip_exception("description参数不能为空") if params[:gtask_bank][:description].blank? if @bank.task_type == 2 - 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 + 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 end if @bank.task_type == 1 params.require(:gtask_bank).permit(:name, :description)