Share the key table between admin and profile resources.

app/controllers/admin/users_controller.rb

@@ -11,7 +11,7 @@ class Admin::UsersController < Admin::ApplicationController
   def show
     @personal_projects = user.personal_projects
     @joined_projects = user.projects.joined(@user)
-    @ssh_keys = user.keys.order('id DESC')
+    @keys = user.keys.order('id DESC')
   end
 
   def new

app/helpers/application_helper.rb

@@ -297,4 +297,12 @@ module ApplicationHelper
   def outdated_browser?
     browser.ie? && browser.version.to_i < 10
   end
+
+  def path_to_key(key, admin = false)
+    if admin
+      admin_user_key_path(@user, key)
+    else
+      profile_key_path(key)
+    end
+  end
 end

app/views/admin/keys/show.html.haml

@@ -1,4 +1 @@
-= render "profiles/keys/key_details"
+= render "profiles/keys/key_details", admin: true
-
-.pull-right
-  = link_to 'Remove', admin_user_key_path(@user, @key), data: {confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove delete-key"

app/views/admin/users/show.html.haml

@@ -220,27 +220,4 @@
                         = link_to project_team_member_path(project, @user), data: { confirm: remove_from_project_team_message(project, @user) }, remote: true, method: :delete, class: "btn-tiny btn btn-remove", title: 'Remove user from project' do
                           %i.fa.fa-times
   #ssh-keys.tab-pane
-    - if @ssh_keys.any?
+    = render 'profiles/keys/key_table', admin: true
-      .panel.panel-default
-        %table.table
-          %thead.panel-heading
-            %tr
-              %th Title
-              %th Fingerprint
-              %th
-          %tbody
-            - @ssh_keys.each do |key|
-              %tr
-                %td
-                  = link_to admin_user_key_path(@user, key) do
-                    %strong= key.title
-                %td
-                  %span
-                    (#{key.fingerprint})
-                  %span.cgray
-                    added #{time_ago_with_tooltip(key.created_at)}
-                %td
-                  = link_to 'Remove', admin_user_key_path(@user, key), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-small btn-remove delete-key pull-right"
-
-    - else
-      .nothing-here-block User has no ssh keys

app/views/profiles/keys/_key.html.haml

@@ -1,9 +1,12 @@
-%li
+%tr
-  = link_to profile_key_path(key) do
+  %td
-    %strong= key.title
+    = link_to path_to_key(key, is_admin) do
-  %span
+      %strong= key.title
-    (#{key.fingerprint})
+  %td
-  %span.cgray
+    %span
-    added #{time_ago_with_tooltip(key.created_at)}
+      (#{key.fingerprint})
-
+  %td
-  = link_to 'Remove', profile_key_path(key), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-small btn-remove delete-key pull-right"
+    %span.cgray
+      added #{time_ago_with_tooltip(key.created_at)}
+  %td
+    = link_to 'Remove', path_to_key(key, is_admin), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-small btn-remove delete-key pull-right"

app/views/profiles/keys/_key_details.html.haml

@@ -1,3 +1,4 @@
+- is_admin = defined?(admin) ? true : false
 .row
   .col-md-4
     .panel.panel-default
@@ -17,3 +18,5 @@
       %strong= @key.fingerprint
     %pre.well-pre
       = @key.key
+  .pull-right
+    = link_to 'Remove', path_to_key(@key, is_admin), data: {confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove delete-key"

app/views/profiles/keys/_key_table.html.haml

@@ -0,0 +1,19 @@
+- is_admin = defined?(admin) ? true : false
+.panel.panel-default
+  - if @keys.any?
+    %table.table
+      %thead.panel-heading
+        %tr
+          %th Title
+          %th Fingerprint
+          %th Added at
+          %th
+      %tbody
+        - @keys.each do |key|
+          = render 'profiles/keys/key', key: key, is_admin: is_admin
+  - else
+    .nothing-here-block
+      - if is_admin
+        User has no ssh keys
+      - else
+        There are no SSH keys with access to your account.

app/views/profiles/keys/index.html.haml

@@ -1,5 +1,5 @@
 %h3.page-title
-  My SSH keys
+  My SSH keys (#{@keys.count})
   .pull-right
     = link_to "Add SSH Key", new_profile_key_path, class: "btn btn-new"
 %p.light
@@ -9,14 +9,4 @@
   = link_to "generate it", help_page_path("ssh", "ssh")
 %hr
 
-
+= render 'key_table'
-.panel.panel-default
-  .panel-heading
-    SSH Keys (#{@keys.count})
-  %ul.well-list#keys-table
-    = render @keys
-    - if @keys.blank?
-      %li
-        .nothing-here-block There are no SSH keys with access to your account.
-
-

app/views/profiles/keys/show.html.haml

@@ -1,4 +1 @@
 = render "key_details"
-
-.pull-right
-  = link_to 'Remove', profile_key_path(@key), data: {confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove delete-key"