From 6df01dead143ae1cee6068a5305d32fc5a83b02f Mon Sep 17 00:00:00 2001
From: Jasder <2053003901@@qq.com>
Date: Fri, 16 Oct 2020 11:07:28 +0800
Subject: [PATCH] FIX unbind devops bug

---
 .../concerns/ci/cloud_account_manageable.rb            | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/controllers/concerns/ci/cloud_account_manageable.rb b/app/controllers/concerns/ci/cloud_account_manageable.rb
index a3418f711..d97bab309 100644
--- a/app/controllers/concerns/ci/cloud_account_manageable.rb
+++ b/app/controllers/concerns/ci/cloud_account_manageable.rb
@@ -55,14 +55,10 @@ module Ci::CloudAccountManageable
 
   def unbind_account!
     cloud_account = current_user.ci_cloud_account
+    return render_error('你未绑定CI服务器') if current_user.devops_step == User::DEVOPS_UNINIT || cloud_account.blank?
 
-    if current_user.devops_step == User::DEVOPS_UNINIT || cloud_account.blank?
-      return render_error('你未绑定CI服务器')
-    elsif current_user.ci_certification?
-      cloud_account.destroy!
-      # TOTO drop drone database
-      @connection.execute("DROP DATABASE IF EXISTS #{current_user.login}_drone")
-    end
+    cloud_account.destroy! unless cloud_account.blank?
+    @connection.execute("DROP DATABASE IF EXISTS #{current_user.login}_drone") # TOTO drop drone database
 
     current_user.unbind_account!
   end