Download as
Browse Code »

Commit b8b6515f935ffc9a27b7a735514dc39e8c092148

Authored by miks
1 parent 99b8b577
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Renamed project "keys" back to "deploy_keys"

Showing 2 changed files with 10 additions and 10 deletions   Show diff stats
app/controllers/deploy_keys_controller.rb
  Diff comments   View file @b8b6515
... ... @@ -12,28 +12,28 @@ class DeployKeysController < ApplicationController
12 12 end
13 13  
14 14 def index
15   - @keys = @project.keys.all
  15 + @keys = @project.deploy_keys.all
16 16 end
17 17  
18 18 def show
19   - @key = @project.keys.find(params[:id])
  19 + @key = @project.deploy_keys.find(params[:id])
20 20 end
21 21  
22 22 def new
23   - @key = @project.keys.new
  23 + @key = @project.deploy_keys.new
24 24  
25 25 respond_with(@key)
26 26 end
27 27  
28 28 def create
29   - @key = @project.keys.new(params[:key])
  29 + @key = @project.deploy_keys.new(params[:key])
30 30 @key.save
31 31  
32 32 respond_with(@key)
33 33 end
34 34  
35 35 def destroy
36   - @key = @project.keys.find(params[:id])
  36 + @key = @project.deploy_keys.find(params[:id])
37 37 @key.destroy
38 38  
39 39 respond_to do |format|
... ...
app/models/project.rb
  Diff comments   View file @b8b6515
... ... @@ -14,7 +14,7 @@ class Project < ActiveRecord::Base
14 14 has_many :users, :through => :users_projects
15 15 has_many :notes, :dependent => :destroy
16 16 has_many :snippets, :dependent => :destroy
17   - has_many :keys, :dependent => :destroy
  17 + has_many :deploy_keys, :dependent => :destroy, :foreign_key => "project_id", :class_name => "Key"
18 18 has_many :web_hooks, :dependent => :destroy
19 19  
20 20 acts_as_taggable
... ... @@ -189,15 +189,15 @@ class Project < ActiveRecord::Base
189 189 end
190 190  
191 191 def repository_readers
192   - read_keys = Key.joins({:user => :users_projects}).
  192 + keys = Key.joins({:user => :users_projects}).
193 193 where("users_projects.project_id = ? AND users_projects.repo_access = ?", id, Repository::REPO_R)
194   - read_keys.map(&:identifier) + keys.map(&:identifier)
  194 + keys.map(&:identifier) + deploy_keys.map(&:identifier)
195 195 end
196 196  
197 197 def repository_writers
198   - write_keys = Key.joins({:user => :users_projects}).
  198 + keys = Key.joins({:user => :users_projects}).
199 199 where("users_projects.project_id = ? AND users_projects.repo_access = ?", id, Repository::REPO_RW)
200   - write_keys.map(&:identifier)
  200 + keys.map(&:identifier)
201 201 end
202 202  
203 203 def readers
... ...