Browse Source

ADD ci namespace modle associations

tags/v1.0.0
Jasder 5 years ago
parent
commit
217dfc03b2
5 changed files with 7 additions and 4 deletions
  1. +1
    -1
      app/models/ci/cloud_account.rb
  2. +2
    -1
      app/models/ci/log.rb
  3. +2
    -2
      app/models/ci/perm.rb
  4. +1
    -0
      app/models/ci/repo.rb
  5. +1
    -0
      app/models/ci/step.rb

+ 1
- 1
app/models/ci/cloud_account.rb View File

@@ -1,6 +1,6 @@
class Ci::CloudAccount < Ci::LocalBase
belongs_to :user
belongs_to :ci_user, class_name: 'Ci::User', foreign_key: :ci_user_id
belongs_to :ci_user, class_name: 'Ci::User', foreign_key: :ci_user_id, optional: true

def drone_host
[drone_ip, ":80"].join


+ 2
- 1
app/models/ci/log.rb View File

@@ -1,4 +1,5 @@
class Ci::Log < Ci::RemoteBase
self.primary_key = 'log_id'
self.primary_key = nil

belongs_to :step, class_name: 'Ci::Step', foreign_key: :log_id
end

+ 2
- 2
app/models/ci/perm.rb View File

@@ -1,6 +1,6 @@
class Ci::Perm < Ci::RemoteBase
self.primary_key = nil

belongs_to :ci_user, class_name: 'Ci::User', foreign_key: :perm_user_id
belongs_to :user, class_name: 'Ci::User', foreign_key: :perm_user_id
belongs_to :repo, class_name: 'Ci::Repo', foreign_key: :perm_repo_uid
end

+ 1
- 0
app/models/ci/repo.rb View File

@@ -2,6 +2,7 @@ class Ci::Repo < Ci::RemoteBase
self.primary_key = 'repo_id'

belongs_to :user, foreign_key: :repo_user_id
has_one :perm, foreign_key: :perm_repo_uid, dependent: :destroy
has_many :builds, foreign_key: "build_repo_id", dependent: :destroy

def self.find_with_namespace(namespace_path, identifier)


+ 1
- 0
app/models/ci/step.rb View File

@@ -2,4 +2,5 @@ class Ci::Step < Ci::RemoteBase
self.primary_key = 'step_id'

belongs_to :stage, foreign_key: :step_stage_id
has_one :log, class_name: 'Ci::Log', foreign_key: :log_id
end

Loading…
Cancel
Save