anph
/
forgeplus
forked from Trustie/forgeplus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX CI 修复参数设置的bug

This commit is contained in:
jasder 2021-03-05 15:48:08 +08:00
parent 50928f82c0 d3df04fb97
commit 899e7ccab8
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/controllers/ci/secrets_controller.rb
View File

@ -4,28 +4,26 @@ class Ci::SecretsController < Ci::BaseController
# 参数列表 # 参数列表
def index def index
cloud_account = current_user.ci_cloud_account result = Ci::Drone::API.new(@ci_user.user_hash, ci_drone_url, params[:owner], params[:repo], nil).secrets
result = Ci::Drone::API.new(@ci_user.user_hash, cloud_account.drone_url, params[:owner], params[:repo], nil).secrets
@secrets = result @secrets = result
end end
#新增、更新参数 #新增、更新参数
def create def create
cloud_account = current_user.ci_cloud_account
options = { options = {
name: params[:name], name: params[:name],
data: params[:data] data: params[:data]
} }
id = params[:id] id = params[:id]
if id if id
result = Ci::Drone::API.new(@ci_user.user_hash, cloud_account.drone_url, params[:owner], params[:repo], options).update_secret result = Ci::Drone::API.new(@ci_user.user_hash, ci_drone_url, params[:owner], params[:repo], options).update_secret
if result["id"] if result["id"]
render_ok render_ok
else else
render_error(result["message"]) render_error(result["message"])
end end
else else
result = Ci::Drone::API.new(@ci_user.user_hash, cloud_account.drone_url, params[:owner], params[:repo], options).create_secret result = Ci::Drone::API.new(@ci_user.user_hash, ci_drone_url, params[:owner], params[:repo], options).create_secret
if result["id"] if result["id"]
render_ok render_ok
else else
@ -38,8 +36,7 @@ class Ci::SecretsController < Ci::BaseController
def destroy def destroy
name = params[:name] name = params[:name]
if !name.blank? if !name.blank?
cloud_account = current_user.ci_cloud_account Ci::Drone::API.new(@ci_user.user_hash, ci_drone_url, params[:owner], params[:repo], {name: name}).delete_secret
Ci::Drone::API.new(@ci_user.user_hash, cloud_account.drone_url, params[:owner], params[:repo], {name: name}).delete_secret
render_ok render_ok
else else
render_error("参数名不能为空") render_error("参数名不能为空")
@ -48,4 +45,9 @@ class Ci::SecretsController < Ci::BaseController
render_ok render_ok
end end
def ci_drone_url
user = User.find_by(login: params[:owner])
user&.ci_cloud_account.drone_url
end
end end