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

Fixed: Issues

This commit is contained in:
sylor_huang@126.com 2020-08-24 15:06:05 +08:00
parent 46801284aa
commit 200cb70f4b
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,13 +6,12 @@ class Ci::CloudAccountsController < Ci::BaseController
before_action :find_cloud_account, only: %i[activate] before_action :find_cloud_account, only: %i[activate]
def create def create
logger.info "#########project_id: #{@project&.id}"
ActiveRecord::Base.transaction do ActiveRecord::Base.transaction do
Ci::CreateCloudAccountForm.new(devops_params).validate! Ci::CreateCloudAccountForm.new(devops_params).validate!
# 1. 保存华为云服务器帐号 # 1. 保存华为云服务器帐号
create_params = devops_params.merge(ip_num: IPAddr.new(devops_params[:ip_num]).to_i, secret: Ci::CloudAccount.encrypted_secret(devops_params[:secret])) create_params = devops_params.merge(ip_num: IPAddr.new(devops_params[:ip_num]).to_i, secret: Ci::CloudAccount.encrypted_secret(devops_params[:secret]))
if cloud_account = @project.ci_cloud_account if current_user&.ci_cloud_account.present?
return render_error('该仓库已绑定了云帐号.') return render_error('该仓库已绑定了云帐号.')
else else
cloud_account = Ci::CloudAccount.new(create_params) cloud_account = Ci::CloudAccount.new(create_params)

1
app/controllers/concerns/devopsable.rb
View File

@ -6,7 +6,6 @@ module Devopsable
# ci 权限验证 # ci 权限验证
def ci_authorize! def ci_authorize!
Rails.logger.info("================project_id :#{@project&.id}")
render_forbidden unless @project.owner?(current_user) render_forbidden unless @project.owner?(current_user)
end end