Browse Source

fix: update repository identifier valid

tags/v4.0.0
yystopf 4 years ago
parent
commit
98a45eb05c
2 changed files with 4 additions and 3 deletions
  1. +2
    -2
      app/controllers/projects_controller.rb
  2. +2
    -1
      app/forms/projects/update_form.rb

+ 2
- 2
app/controllers/projects_controller.rb View File

@@ -127,9 +127,9 @@ class ProjectsController < ApplicationController
Gitea::Repository::UpdateService.call(@owner, @project.identifier, gitea_params)
else
validate_params = project_params.slice(:name, :description,
:project_category_id, :project_language_id, :private)
:project_category_id, :project_language_id, :private, :identifier)
Projects::UpdateForm.new(validate_params).validate!
Projects::UpdateForm.new(validate_params.merge(user_id: @project.user_id)).validate!
private = @project.forked_from_project.present? ? !@project.forked_from_project.is_public : params[:private] || false



+ 2
- 1
app/forms/projects/update_form.rb View File

@@ -1,11 +1,12 @@
class Projects::UpdateForm < BaseForm
attr_accessor :name, :description, :project_category_id, :project_language_id, :private
attr_accessor :name, :description, :project_category_id, :project_language_id, :private, :identifier, :user_id
validates :name, presence: true
validates :name, length: { maximum: 50 }
validates :description, length: { maximum: 200 }
validate do
check_project_category(project_category_id)
check_project_language(project_language_id)
check_repository_name(user_id, identifier) unless identifier.blank?
end

end

Loading…
Cancel
Save