From ab29b138c357a34a715534cae6fa1dd5d498447e Mon Sep 17 00:00:00 2001 From: modulos Date: Sat, 3 Jun 2017 13:33:05 +0200 Subject: [PATCH 1/2] 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 @@
- +
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 @@ Active + + +
+ + {% endfor %} 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\d+)/?$', SSHKeyDeleteView.as_view(), + name='delete_ssh_key'), url(r'^notifications/$', NotificationsView.as_view(), name='notifications'), url(r'^notifications/(?P\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 From 346733fbcd79456b88181af4a0a8f4bd242ff616 Mon Sep 17 00:00:00 2001 From: Modulos Date: Sat, 3 Jun 2017 15:03:55 +0200 Subject: [PATCH 2/2] Allow users to delete ssh keys --- hosting/templates/hosting/base_short.html | 4 +- hosting/templates/hosting/user_key.html | 92 ++++++++++ hosting/templates/hosting/user_keys.html | 96 +++++++++++ .../hosting/virtual_machine_key.html | 163 ------------------ hosting/urls.py | 13 +- hosting/views.py | 84 +++++---- 6 files changed, 250 insertions(+), 202 deletions(-) create mode 100644 hosting/templates/hosting/user_key.html create mode 100644 hosting/templates/hosting/user_keys.html delete mode 100644 hosting/templates/hosting/virtual_machine_key.html diff --git a/hosting/templates/hosting/base_short.html b/hosting/templates/hosting/base_short.html index 022629b0..37ebb813 100644 --- a/hosting/templates/hosting/base_short.html +++ b/hosting/templates/hosting/base_short.html @@ -85,7 +85,7 @@