Commit b8b6515f authored by miks's avatar miks
Browse files

Renamed project "keys" back to "deploy_keys"

parent 553a9ec743a6
......@@ -12,28 +12,28 @@ def project
end
def index
@keys = @project.keys.all
@keys = @project.deploy_keys.all
end
def show
@key = @project.keys.find(params[:id])
@key = @project.deploy_keys.find(params[:id])
end
def new
@key = @project.keys.new
@key = @project.deploy_keys.new
respond_with(@key)
end
def create
@key = @project.keys.new(params[:key])
@key = @project.deploy_keys.new(params[:key])
@key.save
respond_with(@key)
end
def destroy
@key = @project.keys.find(params[:id])
@key = @project.deploy_keys.find(params[:id])
@key.destroy
respond_to do |format|
......
......@@ -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 @@ def reset_access(user)
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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment