floraachy/gitlink-forgeplus
1
0
Fork 0
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git synced 2026-05-17 10:15:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

FIX ci active repo bug

Browse Source
This commit is contained in:
Jasder
2020-08-28 11:40:29 +08:00
parent b9a57be67d
commit 903103ec5d
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
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