Clean up code.

2 files changed, 19 insertions, 10 deletions

diff --git a/app/controllers/admin/deploy_keys_controller.rb b/app/controllers/admin/deploy_keys_controller.rb
index 0664b26ddda..e93603bef36 100644
--- a/app/controllers/admin/deploy_keys_controller.rb
+++ b/app/controllers/admin/deploy_keys_controller.rb
@@ -1,8 +1,9 @@
 class Admin::DeployKeysController < Admin::ApplicationController
+  before_filter :deploy_keys, only: [:index]
   before_filter :deploy_key, only: [:show, :destroy]
 
   def index
-    @deploy_keys = DeployKey.are_public
+
   end
 
   def show
@@ -10,12 +11,11 @@ class Admin::DeployKeysController < Admin::ApplicationController
   end
 
   def new
-    @deploy_key = DeployKey.new(public: true)
+    @deploy_key = deploy_keys.new
   end
 
   def create
-    @deploy_key = DeployKey.new(deploy_key_params)
-    @deploy_key.public = true
+    @deploy_key = deploy_keys.new(deploy_key_params)
 
     if @deploy_key.save
       redirect_to admin_deploy_keys_path
@@ -36,7 +36,11 @@ class Admin::DeployKeysController < Admin::ApplicationController
   protected
 
   def deploy_key
-    @deploy_key ||= DeployKey.find(params[:id])
+    @deploy_key ||= deploy_keys.find(params[:id])
+  end
+
+  def deploy_keys
+    @deploy_keys ||= DeployKey.are_public
   end
 
   def deploy_key_params
diff --git a/app/controllers/projects/deploy_keys_controller.rb b/app/controllers/projects/deploy_keys_controller.rb
index 176d112a4d7..6fba3ce299b 100644
--- a/app/controllers/projects/deploy_keys_controller.rb
+++ b/app/controllers/projects/deploy_keys_controller.rb
@@ -8,9 +8,14 @@ class Projects::DeployKeysController < Projects::ApplicationController
 
   def index
     @enabled_keys = @project.deploy_keys
-    @available_keys = available_keys - @enabled_keys
+
+    @available_keys         = accessible_keys - @enabled_keys
     @available_project_keys = current_user.project_deploy_keys - @enabled_keys
-    @available_public_keys = DeployKey.are_public - @available_project_keys - @enabled_keys
+    @available_public_keys  = DeployKey.are_public - @enabled_keys
+
+    # Public keys that are already used by another accessible project are already
+    # in @available_project_keys.
+    @available_public_keys -= @available_project_keys
   end
 
   def show
@@ -35,7 +40,7 @@ class Projects::DeployKeysController < Projects::ApplicationController
   end
 
   def enable
-    @key = current_user.accessible_deploy_keys.find(params[:id])
+    @key = accessible_keys.find(params[:id])
     @project.deploy_keys << @key
 
     redirect_to namespace_project_deploy_keys_path(@project.namespace,
@@ -50,8 +55,8 @@ class Projects::DeployKeysController < Projects::ApplicationController
 
   protected
 
-  def available_keys
-    @available_keys ||= current_user.accessible_deploy_keys
+  def accessible_keys
+    @accessible_keys ||= current_user.accessible_deploy_keys
   end
 
   def deploy_key_params