diff --git a/app/controllers/admins/project_ignores_controller.rb b/app/controllers/admins/project_ignores_controller.rb index 360f189c0..6450f6afc 100644 --- a/app/controllers/admins/project_ignores_controller.rb +++ b/app/controllers/admins/project_ignores_controller.rb @@ -1,6 +1,6 @@ class Admins::ProjectIgnoresController < Admins::BaseController before_action :set_ignore, only: [:edit,:update, :destroy,:show] - before_action :validate_params, only: [:create, :update] + # before_action :validate_params, only: [:create, :update] def index sort_by = Ignore.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'created_at' @@ -31,12 +31,12 @@ class Admins::ProjectIgnoresController < Admins::BaseController # } @project_ignore = Ignore.new(ignore_params) - if @project_ignore.save! + if @project_ignore.save redirect_to admins_project_ignores_path flash[:success] = "创建成功" else - render :new - flash[:danger] = "创建失败" + redirect_to admins_project_ignores_path + flash[:danger] = @project_ignore.errors.full_messages.join(",") end end @@ -58,8 +58,8 @@ class Admins::ProjectIgnoresController < Admins::BaseController redirect_to admins_project_ignores_path flash[:success] = "更新成功" else - render :edit - flash[:danger] = "更新失败" + redirect_to admins_project_ignores_path + flash[:danger] = @project_ignore.errors.full_messages.join(",") end end @@ -98,23 +98,23 @@ class Admins::ProjectIgnoresController < Admins::BaseController params.require(:ignore).permit(:name,:content) end - def validate_params - name = params[:ignore][:name] - if name.blank? - flash[:danger] = "名称不允许为空" - redirect_to admins_project_ignores_path - elsif check_ignore_present?(name) && @project_ignore.blank? - flash[:danger] = "创建失败:名称已存在" - redirect_to admins_project_ignores_path - end - end + # def validate_params + # name = params[:ignore][:name] + # if name.blank? + # flash[:danger] = "名称不允许为空" + # redirect_to admins_project_ignores_path + # elsif check_ignore_present?(name) && @project_ignore.blank? + # flash[:danger] = "创建失败:名称已存在" + # redirect_to admins_project_ignores_path + # end + # end - def check_ignore_present?(name) - return true if name.blank? - name_downcase = name.downcase - name_upcase = name.upcase - name_first_big = name.capitalize - Ignore.exists?(name: name_downcase) || Ignore.exists?(name: name_upcase) || Ignore.exists?(name: name_first_big) - end + # def check_ignore_present?(name) + # return true if name.blank? + # name_downcase = name.downcase + # name_upcase = name.upcase + # name_first_big = name.capitalize + # Ignore.exists?(name: name_downcase) || Ignore.exists?(name: name_upcase) || Ignore.exists?(name: name_first_big) + # end end diff --git a/app/models/ignore.rb b/app/models/ignore.rb index a6dc9a5ac..7220ee75d 100644 --- a/app/models/ignore.rb +++ b/app/models/ignore.rb @@ -11,4 +11,7 @@ class Ignore < ApplicationRecord include Projectable + + validates :name, :content, presence: true + validates :name, uniqueness: { case_sensitive: false } end diff --git a/app/models/license.rb b/app/models/license.rb index 676254717..d14a9db14 100644 --- a/app/models/license.rb +++ b/app/models/license.rb @@ -12,7 +12,7 @@ class License < ApplicationRecord include Projectable - validates :content, presence: true - validates :name, uniqueness: true, presence: true + validates :name, :content, presence: true + validates :name, uniqueness: { case_sensitive: false } end diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 95b7c429b..d1023ce2a 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -226,6 +226,9 @@ zh-CN: license: name: '许可证名称' content: '许可证内容' + ignore: + name: 'git忽略文件名称' + content: 'git忽略文件内容' close_pr: 合并请求 roles: Developer: 开发者