Browse Source

FIX ci active repo bug

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

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

@@ -65,11 +65,12 @@ class Ci::CloudAccountsController < Ci::BaseController
def activate
return render_error('请先在指定地址做用户认证') unless current_user.ci_certification?

return render_error('该项目已经激活') if @repo.repo_active?
return render_error('该项目已经激活') if @repo && @repo.repo_active?

ci_user = Ci::User.find_by(user_login: current_user.login)
repo = Ci::Repo.where(repo_namespace: current_user.login, repo_name: params[:repo]).first
begin
@repo.activate!
repo.activate!(ci_user.user_id)
@project.update_column(:open_devops, true)
@cloud_account.update_column(ci_user_id: ci_user.user_id)
render_ok


+ 2
- 1
app/models/ci/repo.rb View File

@@ -16,10 +16,11 @@ class Ci::Repo < Ci::RemoteBase
[user, repo]
end

def activate!
def activate!(ci_user_id)
update_columns(repo_active: 1,
repo_signer: generate_code,
repo_secret: generate_code,
repo_user_id: ci_user_id,
repo_config: '.trustie-pipeline.yml',
repo_updated: Time.now.to_i)
end


Loading…
Cancel
Save