floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

FIX user bug

This commit is contained in:
Jasder 2020-09-11 10:00:29 +08:00
parent f3d6244fee
commit 9568523286
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/ci/cloud_accounts_controller.rb
View File

@ -31,15 +31,15 @@ class Ci::CloudAccountsController < Ci::BaseController
ActiveRecord::Base.transaction do ActiveRecord::Base.transaction do
if @repo if @repo
return render_error('该项目已经激活') if @repo.repo_active? return render_error('该项目已经激活') if @repo.repo_active?
@repo.activate!(current_user.user_id) @repo.activate!(@user.user_id)
else else
@repo = Ci::Repo.auto_create!(current_user, @project) @repo = Ci::Repo.auto_create!(@user, @project)
@user.update_column(:user_syncing, false) @user.update_column(:user_syncing, false)
end end
result = bind_hook!(current_user, @cloud_account, @repo) result = bind_hook!(current_user, @cloud_account, @repo)
@project.update_columns(open_devops: true, gitea_webhook_id: result['id']) @project.update_columns(open_devops: true, gitea_webhook_id: result['id'])
@cloud_account.update_column(:ci_user_id, current_user.user_id) @cloud_account.update_column(:ci_user_id, @user.user_id)
end end
render_ok render_ok
rescue Exception => ex rescue Exception => ex