From ab29b138c357a34a715534cae6fa1dd5d498447e Mon Sep 17 00:00:00 2001
From: modulos <modulos@protonmail.com>
Date: Sat, 3 Jun 2017 13:33:05 +0200
Subject: [PATCH] Add delete ssh key modal

---
 hosting/templates/hosting/orders.html         |  2 +-
 .../hosting/virtual_machine_key.html          | 35 +++++++++++++++++++
 hosting/tests.py                              |  4 ++-
 hosting/urls.py                               |  4 ++-
 hosting/views.py                              |  5 +++
 5 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/hosting/templates/hosting/orders.html b/hosting/templates/hosting/orders.html
index 16a739a0..d4a03fe8 100644
--- a/hosting/templates/hosting/orders.html
+++ b/hosting/templates/hosting/orders.html
@@ -53,7 +53,7 @@
                                             </button>
                                         </div>
                                         <div class="modal-body">
-                                            <h4 class="modal-title" id="ModalLabel">{% trans "Do You want do delete your order?"%}</h4>
+                                            <h4 class="modal-title" id="ModalLabel">{% trans "Do You want to delete your order?"%}</h4>
 
                                             <form method="post"
                                                   action="{% url 'hosting:delete_order' order.id %}">
diff --git a/hosting/templates/hosting/virtual_machine_key.html b/hosting/templates/hosting/virtual_machine_key.html
index a2c3aef7..b97b106d 100644
--- a/hosting/templates/hosting/virtual_machine_key.html
+++ b/hosting/templates/hosting/virtual_machine_key.html
@@ -54,6 +54,41 @@
                                             <span class="h3 label label-success"><strong>Active</strong></span>
 
                                         </td> 
+										<td> 
+											<button type="button" class="btn btn-default" data-toggle="modal"
+													data-target="#Modal{{ user_key.id }}"><a
+													href="#">{% trans "Delete Key"%}</a>
+											</button>
+							<div class="modal fade" id="Modal{{user_key.id }}" tabindex="-1" role="dialog">
+                                <div class="modal-dialog" role="document">
+                                    <div class="modal-content">
+                                        <div class="modal-header">
+                                            <button type="button" class="close" data-dismiss="modal"
+                                                    aria-label="Confirm"><span
+                                                    aria-hidden="true">&times;</span>
+                                            </button>
+                                        </div>
+                                        <div class="modal-body">
+                                            <h4 class="modal-title" id="ModalLabel">{% trans "Do You want to delete this key?"%}</h4>
+
+                                            <form method="post"
+                                                  action="{% url 'hosting:delete_ssh_key' user_key.id %}">
+                                                {% csrf_token %}
+                                                <div class="modal-footer">
+                                                    <button type="button" class="btn btn-default"
+                                                            data-dismiss="modal">
+                                                        {% trans "Close"%}
+                                                    </button>
+                                                    <button type="submit" class="btn btn-primary">{% trans "Delete"%}
+                                                    </button>
+                                                </div>
+                                            </form>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+
+
                                     </tr>
 									{% endfor %}
                                 </tbody> 
diff --git a/hosting/tests.py b/hosting/tests.py
index 7cee782d..d9b5da5b 100644
--- a/hosting/tests.py
+++ b/hosting/tests.py
@@ -2,4 +2,6 @@ from django.test import TestCase
 
 # Create your tests here.
 
-test_user_can_add_key()
+test_user_can_add_ssh_key()
+
+test_user_can_delete_ssh_ke()
diff --git a/hosting/urls.py b/hosting/urls.py
index d5923cf4..36475ad6 100644
--- a/hosting/urls.py
+++ b/hosting/urls.py
@@ -5,7 +5,7 @@ from .views import DjangoHostingView, RailsHostingView, PaymentVMView,\
     OrdersHostingListView, OrdersHostingDetailView, VirtualMachinesPlanListView,\
     VirtualMachineView, GenerateVMSSHKeysView, OrdersHostingDeleteView, NotificationsView, \
     MarkAsReadNotificationView, PasswordResetView, PasswordResetConfirmView, HostingPricingView,\
-    CreateVirtualMachinesView, HostingBillListView, HostingBillDetailView
+    CreateVirtualMachinesView, HostingBillListView, HostingBillDetailView, SSHKeyDeleteView
 
 urlpatterns = [
     url(r'index/?$', IndexView.as_view(), name='index'),
@@ -27,6 +27,8 @@ urlpatterns = [
         # name='virtual_machines_cancel'),
     url(r'vm-key-pair/?$', GenerateVMSSHKeysView.as_view(),
         name='key_pair'),
+    url(r'delete_ssh_key/(?P<pk>\d+)/?$', SSHKeyDeleteView.as_view(),
+        name='delete_ssh_key'),
     url(r'^notifications/$', NotificationsView.as_view(), name='notifications'),
     url(r'^notifications/(?P<pk>\d+)/?$', MarkAsReadNotificationView.as_view(),
         name='read_notification'),
diff --git a/hosting/views.py b/hosting/views.py
index 3044590b..90344aeb 100644
--- a/hosting/views.py
+++ b/hosting/views.py
@@ -288,6 +288,11 @@ class MarkAsReadNotificationView(LoginRequiredMixin, UpdateView):
         return HttpResponseRedirect(reverse('hosting:notifications'))
 
 
+class SSHKeyDeleteView(LoginRequiredMixin, DeleteView):
+    login_url = reverse_lazy('hosting:login')
+    success_url = reverse_lazy('hosting:key-pair')
+    model = UserHostingKey
+
 class GenerateVMSSHKeysView(LoginRequiredMixin, FormView):
     form_class = UserHostingKeyForm
     model = UserHostingKey