Merge branch 'sync_develop' into develop
This commit is contained in:
commit
acc4282c8e
|
@ -106,7 +106,16 @@ class ProjectsController < ApplicationController
|
||||||
|
|
||||||
def update
|
def update
|
||||||
ActiveRecord::Base.transaction do
|
ActiveRecord::Base.transaction do
|
||||||
Projects::UpdateForm.new(project_params).validate!
|
# TODO:
|
||||||
|
# 临时特殊处理修改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
|
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)
|
||||||
|
@ -121,6 +130,7 @@ class ProjectsController < ApplicationController
|
||||||
@project.repository.update_column(:hidden, private)
|
@project.repository.update_column(:hidden, private)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
rescue Exception => e
|
rescue Exception => e
|
||||||
uid_logger_error(e.message)
|
uid_logger_error(e.message)
|
||||||
tip_exception(e.message)
|
tip_exception(e.message)
|
||||||
|
|
Loading…
Reference in New Issue