From 300997699abd0747629f686477b5b453ed8b67f8 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Sun, 24 Sep 2017 01:08:15 +0530
Subject: [PATCH] Redirecting new user to my virtual machines page and not
 forcing ssh key for creating a vm

---
 .../templates/hosting/virtual_machines.html   |  7 +++++-
 hosting/views.py                              | 24 +++++--------------
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/hosting/templates/hosting/virtual_machines.html b/hosting/templates/hosting/virtual_machines.html
index f7461abe..31843130 100644
--- a/hosting/templates/hosting/virtual_machines.html
+++ b/hosting/templates/hosting/virtual_machines.html
@@ -13,7 +13,12 @@
         {% endif %}
         {% if not error %}
             <div class="dashboard-subtitle">
-                <p>{% trans 'To create a new virtual machine, click "Create VM"' %}</p>
+                <p>{% trans 'To create a new virtual machine, click "Create VM"' %}
+                {% if show_create_ssh_key_msg %}
+                     {% url 'hosting:create_ssh_key' as create_ssh_url %}
+                     <br/>{% blocktrans %}To access your VM, add your SSH key <a href="{{create_ssh_url}}">here</a>{% endblocktrans %}
+                {% endif %}
+                </p>
                 <div class="text-right">
                     <a class="btn btn-vm" href="{% url 'hosting:create_virtual_machine' %}"><span class="css-plus"></span> <span>{% trans "CREATE VM" %}</span></a>
                 </div>
diff --git a/hosting/views.py b/hosting/views.py
index e1d2feb2..21b0a9b5 100644
--- a/hosting/views.py
+++ b/hosting/views.py
@@ -592,13 +592,6 @@ class PaymentVMView(LoginRequiredMixin, FormView):
         return context
 
     def get(self, request, *args, **kwargs):
-        if not UserHostingKey.objects.filter(user=self.request.user).exists():
-            messages.success(
-                request,
-                'In order to create a VM, you create/upload your SSH KEY first.'
-            )
-            return HttpResponseRedirect(reverse('hosting:ssh_keys'))
-
         if 'next' in request.session:
             del request.session['next']
 
@@ -775,8 +768,8 @@ class OrdersHostingDetailView(LoginRequiredMixin,
             'redirect': reverse('hosting:virtual_machines'),
             'msg_title': str(_('Thank you for the order.')),
             'msg_body': str(_('Your VM will be up and running in a few moments.'
-                          ' We will send you a confirmation email as soon as'
-                          ' it is ready.'))
+                              ' We will send you a confirmation email as soon as'
+                              ' it is ready.'))
         }
 
         return HttpResponse(json.dumps(response),
@@ -834,6 +827,10 @@ class VirtualMachinesPlanListView(LoginRequiredMixin, ListView):
             context = {'error': 'connection'}
         else:
             context = super(ListView, self).get_context_data(**kwargs)
+            if UserHostingKey.objects.filter(user=self.request.user).exists():
+                context['show_create_ssh_key_msg'] = False
+            else:
+                context['show_create_ssh_key_msg'] = True
         return context
 
 
@@ -842,15 +839,6 @@ class CreateVirtualMachinesView(LoginRequiredMixin, View):
     login_url = reverse_lazy('hosting:login')
 
     def get(self, request, *args, **kwargs):
-
-        if not UserHostingKey.objects.filter(user=self.request.user).exists():
-            messages.success(
-                request,
-                _(
-                    'In order to create a VM, you need to create/upload your SSH KEY first.')
-            )
-            return HttpResponseRedirect(reverse('hosting:ssh_keys'))
-
         try:
             manager = OpenNebulaManager()
             templates = manager.get_templates()