Merge branch 'sync_develop' into develop

app/controllers/projects_controller.rb

@@ -106,19 +106,29 @@ class ProjectsController < ApplicationController
 
   def update
     ActiveRecord::Base.transaction do
-      Projects::UpdateForm.new(project_params).validate!
+      # TODO:
-      private = params[:private] || false
+      # 临时特殊处理修改website、lesson_url操作方法
+      if project_params.has_key?("website")
+        @project.update(project_params)
+      else
+        validate_params = project_params.slice(:name, :description, 
+          :project_category_id, :project_language_id, :private)
+  
+        Projects::UpdateForm.new(validate_params).validate!
+  
+        private = params[:private] || false
 
-      new_project_params = project_params.except(:private).merge(is_public: !private)
+        new_project_params = project_params.except(:private).merge(is_public: !private)
-      @project.update_attributes!(new_project_params)
+        @project.update_attributes!(new_project_params)
-      gitea_params = {
+        gitea_params = {
-        private: private,
+          private: private,
-        default_branch: @project.default_branch,
+          default_branch: @project.default_branch,
-        website: @project.website
+          website: @project.website
-      }
+        }
-      if [true, false].include? private
+        if [true, false].include? private
-        Gitea::Repository::UpdateService.call(@owner, @project.identifier, gitea_params)
+          Gitea::Repository::UpdateService.call(@owner, @project.identifier, gitea_params)
-        @project.repository.update_column(:hidden, private)
+          @project.repository.update_column(:hidden, private)
+        end
       end
     end
   rescue Exception => e