From edcb9f863cbdd1c1a7303a4ae82b9bbd7833ea86 Mon Sep 17 00:00:00 2001 From: Jasder <2053003901@@qq.com> Date: Fri, 16 Oct 2020 09:47:36 +0800 Subject: [PATCH] FIX ci certification bug --- app/controllers/ci/cloud_accounts_controller.rb | 3 +-- app/models/concerns/droneable.rb | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/controllers/ci/cloud_accounts_controller.rb b/app/controllers/ci/cloud_accounts_controller.rb index bf825899..1271c708 100644 --- a/app/controllers/ci/cloud_accounts_controller.rb +++ b/app/controllers/ci/cloud_accounts_controller.rb @@ -30,9 +30,8 @@ class Ci::CloudAccountsController < Ci::BaseController end def activate - return render_error('请先在指定地址做用户认证') unless current_user.ci_certification? + return render_error('请先认证') unless current_user.ci_certification? - return render_error('该项目已经激活') if @repo && @repo.repo_active? begin @cloud_account = Ci::CloudAccount.find params[:id] ActiveRecord::Base.transaction do diff --git a/app/models/concerns/droneable.rb b/app/models/concerns/droneable.rb index 87013e2b..f91b9f98 100644 --- a/app/models/concerns/droneable.rb +++ b/app/models/concerns/droneable.rb @@ -22,7 +22,7 @@ module Droneable def ci_certification? return false if self.is_a?(AnonymousUser) - devops_unverified? && Ci::User.exists?(user_login: self.login) + devops_certification? && Ci::User.exists?(user_login: self.login) end def unbind_account!