diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 1fd858be5..c073d5846 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -85,18 +85,19 @@ class ProjectsController < ApplicationController def update ActiveRecord::Base.transaction do # Projects::CreateForm.new(project_params).validate! - private = params[:private] + private = params[:private] || false + + new_project_params = project_params.except(:private).merge(is_public: !private) + @project.update_attributes!(new_project_params) gitea_params = { private: private, - default_branch: params[:default_branch], - website: params[:website] + default_branch: @project.default_branch, + website: @project.website } if [true, false].include? private - new_project_params = project_params.except(:private).merge(is_public: !private) Gitea::Repository::UpdateService.call(@owner, @project.identifier, gitea_params) @project.repository.update_column(:hidden, private) end - @project.update_attributes!(new_project_params) end rescue Exception => e uid_logger_error(e.message) diff --git a/app/views/projects/update.json.jbuilder b/app/views/projects/update.json.jbuilder index 20fa3e07d..ef09d5d85 100644 --- a/app/views/projects/update.json.jbuilder +++ b/app/views/projects/update.json.jbuilder @@ -5,3 +5,4 @@ json.description @project.description json.project_category_id @project.project_category_id json.project_language_id @project.project_language_id json.is_public @project.is_public +json.website @project.website \ No newline at end of file