diff --git a/app/forms/base_form.rb b/app/forms/base_form.rb index c41a12993..c5776048e 100644 --- a/app/forms/base_form.rb +++ b/app/forms/base_form.rb @@ -2,11 +2,11 @@ class BaseForm include ActiveModel::Model def check_project_category(project_category_id) - raise "project_category_id参数值无效." if project_category_id && !ProjectCategory.exists?(project_category_id) + raise "project_category_id参数值无效." unless project_category_id == '' && (project_category_id && !ProjectCategory.exists?(project_category_id)) end def check_project_language(project_language_id) - raise "project_language_id参数值无效." if project_language_id && !ProjectLanguage.exists?(project_language_id) + raise "project_language_id参数值无效." unless project_language_id == '' && (project_language_id && !ProjectLanguage.exists?(project_language_id)) end def check_repository_name(user_id, repository_name) diff --git a/app/forms/projects/update_form.rb b/app/forms/projects/update_form.rb index 65810a820..0cd2c9459 100644 --- a/app/forms/projects/update_form.rb +++ b/app/forms/projects/update_form.rb @@ -1,6 +1,6 @@ class Projects::UpdateForm < BaseForm attr_accessor :name, :description, :project_category_id, :project_language_id, :private - validates :name, :description, :project_category_id, :project_language_id, presence: true + validates :name, presence: true validates :name, length: { maximum: 50 } validates :description, length: { maximum: 200 } validate do