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

流水线增加owner选项

This commit is contained in:
victor 2021-02-02 11:48:09 +08:00
parent 155fc35cfa
commit d2209619f0
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,7 @@ class Ci::PipelinesController < Ci::BaseController
# ======流水线相关接口========== # # ======流水线相关接口========== #
def list def list
@result = Array.new @result = Array.new
list = Ci::Pipeline.where('identifier=?', params[:identifier]) list = Ci::Pipeline.where('identifier=? and owner=?', params[:identifier], params[:owner])
# 查询build状态 # 查询build状态
list.collect do |pipeline| list.collect do |pipeline|
pipeline.last_build_time = nil pipeline.last_build_time = nil
@ -28,12 +28,12 @@ class Ci::PipelinesController < Ci::BaseController
def create def create
ActiveRecord::Base.transaction do ActiveRecord::Base.transaction do
size = Ci::Pipeline.where('branch=? and identifier=?', params[:branch], params[:repo]).size size = Ci::Pipeline.where('branch=? and identifier=? and owner=?', params[:branch], params[:repo], params[:owner]).size
if size > 0 if size > 0
render_error("#{params[:branch]}分支已经存在流水线！") render_error("#{params[:branch]}分支已经存在流水线！")
return return
end end
pipeline = Ci::Pipeline.new(pipeline_name: params[:pipeline_name], file_name: params[:file_name], pipeline = Ci::Pipeline.new(pipeline_name: params[:pipeline_name], file_name: params[:file_name],owner: params[:owner],
login: current_user.login, identifier: params[:repo], branch: params[:branch], event: params[:event]) login: current_user.login, identifier: params[:repo], branch: params[:branch], event: params[:event])
pipeline.save! pipeline.save!

5
db/migrate/20210202034128_add_owner_to_ci_pipelines.rb Normal file
View File

@ -0,0 +1,5 @@
class AddOwnerToCiPipelines < ActiveRecord::Migration[5.2]
def change
add_column :ci_pipelines, :owner, :string
end
end