Merge pull request '增加用户删除组织时创建记录' (#393) from KingChan/forgeplus:standalone_develop into standalone_develop

This commit is contained in:
KingChan 2025-06-19 16:24:35 +08:00
commit 7496a4bdd6
2 changed files with 4 additions and 1 deletions

View File

@ -33,6 +33,7 @@ class Admins::OrganizationsController < Admins::BaseController
data_bank = @org.attributes.to_json
@org.destroy!
Admins::DeleteOrganizationService.call(@org.login)
data_bank = @org.attributes.to_json
UserAction.create(action_id: @org.id, action_type: "DestroyOrganization", user_id: current_user.id, :ip => request.remote_ip, data_bank: data_bank)
render_delete_success
end

View File

@ -107,8 +107,10 @@ class Organizations::OrganizationsController < Organizations::BaseController
tip_exception("密码不正确") unless current_user.check_password?(password)
ActiveRecord::Base.transaction do
gitea_destroy = Gitea::Organization::DeleteService.call(current_user.gitea_token, @organization.login)
if gitea_destroy[:status] == 204
if gitea_destroy[:status] == 204
data_bank = @organization.attributes.to_json
@organization.destroy!
UserAction.create(action_id: @org.id, action_type: "DestroyOrganization", user_id: current_user.id, :ip => request.remote_ip, data_bank: data_bank)
render_ok
elsif gitea_destroy[:status] == 500
tip_exception("当组织内含有仓库时,无法删除此组织")