Browse Source

FIX ci certification bug

tags/v1.0.0
Jasder 5 years ago
parent
commit
edcb9f863c
2 changed files with 2 additions and 3 deletions
  1. +1
    -2
      app/controllers/ci/cloud_accounts_controller.rb
  2. +1
    -1
      app/models/concerns/droneable.rb

+ 1
- 2
app/controllers/ci/cloud_accounts_controller.rb View File

@@ -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


+ 1
- 1
app/models/concerns/droneable.rb View File

@@ -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!


Loading…
Cancel
Save