From d2209619f0d867f5b5a304309f88c054bd6d1c06 Mon Sep 17 00:00:00 2001
From: victor <121183489011@qq.com>
Date: Tue, 2 Feb 2021 11:48:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E6=B0=B4=E7=BA=BF=E5=A2=9E=E5=8A=A0ow?=
 =?UTF-8?q?ner=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/ci/pipelines_controller.rb             | 6 +++---
 db/migrate/20210202034128_add_owner_to_ci_pipelines.rb | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 db/migrate/20210202034128_add_owner_to_ci_pipelines.rb

diff --git a/app/controllers/ci/pipelines_controller.rb b/app/controllers/ci/pipelines_controller.rb
index 4ff6837b2..5b12aa3cc 100644
--- a/app/controllers/ci/pipelines_controller.rb
+++ b/app/controllers/ci/pipelines_controller.rb
@@ -8,7 +8,7 @@ class Ci::PipelinesController < Ci::BaseController
   # ======流水线相关接口========== #
   def list
     @result = Array.new
-    list = Ci::Pipeline.where('identifier=?', params[:identifier])
+    list = Ci::Pipeline.where('identifier=? and owner=?', params[:identifier], params[:owner])
     # 查询build状态
     list.collect do |pipeline|
       pipeline.last_build_time = nil
@@ -28,12 +28,12 @@ class Ci::PipelinesController < Ci::BaseController
 
   def create
     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
         render_error("#{params[:branch]}分支已经存在流水线！")
         return
       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])
       pipeline.save!
 
diff --git a/db/migrate/20210202034128_add_owner_to_ci_pipelines.rb b/db/migrate/20210202034128_add_owner_to_ci_pipelines.rb
new file mode 100644
index 000000000..f5a8d3667
--- /dev/null
+++ b/db/migrate/20210202034128_add_owner_to_ci_pipelines.rb
@@ -0,0 +1,5 @@
+class AddOwnerToCiPipelines < ActiveRecord::Migration[5.2]
+  def change
+    add_column :ci_pipelines, :owner, :string
+  end
+end