Merge pull request 'FIX edit project identifier’s bug' (#201) from dev_trustie_server into trustie_server

app/controllers/projects_controller.rb

@@ -129,7 +129,7 @@ class ProjectsController < ApplicationController
         validate_params = project_params.slice(:name, :description, 
           :project_category_id, :project_language_id, :private, :identifier)
   
-        Projects::UpdateForm.new(validate_params.merge(user_id: @project.user_id)).validate!
+        Projects::UpdateForm.new(validate_params.merge(user_id: @project.user_id, project_identifier: @project.identifier)).validate!
   
         private = @project.forked_from_project.present? ? !@project.forked_from_project.is_public : params[:private] || false
 

app/forms/projects/update_form.rb

@@ -1,12 +1,14 @@
 class Projects::UpdateForm < BaseForm
-  attr_accessor :name, :description, :project_category_id, :project_language_id, :private, :identifier, :user_id
+  attr_accessor :name, :description, :project_category_id, :project_language_id, :private, :identifier, :user_id, :project_identifier
   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?
+    Rails.logger.info project_identifier
+    Rails.logger.info identifier
+    check_repository_name(user_id, identifier) unless identifier.blank? || identifier == project_identifier
   end
 
 end