From c5f22e6c7000bdb9c5e74dc3654112f493cc6f47 Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 7 Dec 2021 13:46:43 +0800 Subject: [PATCH] fix: org delete status error --- app/controllers/organizations/organizations_controller.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/controllers/organizations/organizations_controller.rb b/app/controllers/organizations/organizations_controller.rb index dd4f5066..bf011e5f 100644 --- a/app/controllers/organizations/organizations_controller.rb +++ b/app/controllers/organizations/organizations_controller.rb @@ -57,12 +57,14 @@ class Organizations::OrganizationsController < Organizations::BaseController def destroy tip_exception("密码不正确") unless current_user.check_password?(password) ActiveRecord::Base.transaction do - gitea_status, gitea_message = Gitea::Organization::DeleteService.call(current_user.gitea_token, @organization.login) - if gitea_status == 204 + gitea_destroy = Gitea::Organization::DeleteService.call(current_user.gitea_token, @organization.login) + if gitea_destroy[:status] == 204 @organization.destroy! render_ok - else + elsif gitea_destroy[:status] == 500 tip_exception("当组织内含有仓库时，无法删除此组织") + else + tip_exception("") end end rescue Exception => e