From 543d86f351780ebfd9bdd945e6cc247da4919602 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Mon, 6 May 2013 12:26:36 +0300 Subject: Create DeployKey & DeployKeysProject models. Bulding many to many relation between deploy keys and projects --- app/models/key.rb | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'app/models/key.rb') diff --git a/app/models/key.rb b/app/models/key.rb index ce62b802c0d..31fb522f3ff 100644 --- a/app/models/key.rb +++ b/app/models/key.rb @@ -16,7 +16,6 @@ require 'digest/md5' class Key < ActiveRecord::Base belongs_to :user - belongs_to :project attr_accessible :key, :title @@ -29,7 +28,7 @@ class Key < ActiveRecord::Base delegate :name, :email, to: :user, prefix: true def strip_white_space - self.key = self.key.strip unless self.key.blank? + self.key = key.strip unless key.blank? end def fingerprintable_key @@ -53,14 +52,10 @@ class Key < ActiveRecord::Base # projects that has this key def projects - if is_deploy_key - [project] - else - user.authorized_projects - end + user.authorized_projects end def shell_id - "key-#{self.id}" + "key-#{id}" end end -- cgit v1.2.3