forked from Gitlink/forgeplus
Merge pull request '修复删除bug' (#394) from KingChan/forgeplus:standalone_develop into standalone_develop
This commit is contained in:
commit
76d3c29c42
|
@ -110,7 +110,7 @@ class Organizations::OrganizationsController < Organizations::BaseController
|
|||
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)
|
||||
UserAction.create(action_id: @organization.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("当组织内含有仓库时,无法删除此组织")
|
||||
|
|
Loading…
Reference in New Issue