Renamed project "keys" back to "deploy_keys"
This commit is contained in:
parent
99b8b577e9
commit
b8b6515f93
2 changed files with 10 additions and 10 deletions
|
@ -14,7 +14,7 @@ class Project < ActiveRecord::Base
|
|||
has_many :users, :through => :users_projects
|
||||
has_many :notes, :dependent => :destroy
|
||||
has_many :snippets, :dependent => :destroy
|
||||
has_many :keys, :dependent => :destroy
|
||||
has_many :deploy_keys, :dependent => :destroy, :foreign_key => "project_id", :class_name => "Key"
|
||||
has_many :web_hooks, :dependent => :destroy
|
||||
|
||||
acts_as_taggable
|
||||
|
@ -189,15 +189,15 @@ class Project < ActiveRecord::Base
|
|||
end
|
||||
|
||||
def repository_readers
|
||||
read_keys = Key.joins({:user => :users_projects}).
|
||||
keys = Key.joins({:user => :users_projects}).
|
||||
where("users_projects.project_id = ? AND users_projects.repo_access = ?", id, Repository::REPO_R)
|
||||
read_keys.map(&:identifier) + keys.map(&:identifier)
|
||||
keys.map(&:identifier) + deploy_keys.map(&:identifier)
|
||||
end
|
||||
|
||||
def repository_writers
|
||||
write_keys = Key.joins({:user => :users_projects}).
|
||||
keys = Key.joins({:user => :users_projects}).
|
||||
where("users_projects.project_id = ? AND users_projects.repo_access = ?", id, Repository::REPO_RW)
|
||||
write_keys.map(&:identifier)
|
||||
keys.map(&:identifier)
|
||||
end
|
||||
|
||||
def readers
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue