Merge pull request #257 from levivm/develop

added next url to ssh create key view
This commit is contained in:
Levi Velázquez 2017-05-21 22:47:07 -05:00 committed by GitHub
commit ffc4700faf
3 changed files with 3 additions and 3 deletions

View file

@ -115,7 +115,7 @@
{% if next_url %}
<script type="text/javascript">
window.location.href = '{{next_url}}'
window.location.href = '{{next_url}}';
</script>
{% endif %}

View file

@ -19,7 +19,7 @@ urlpatterns = [
url(r'bills/?$', HostingBillListView.as_view(), name='bills'),
url(r'bills/(?P<pk>\d+)/?$', HostingBillDetailView.as_view(), name='bills'),
url(r'cancel_order/(?P<pk>\d+)/?$', OrdersHostingDeleteView.as_view(), name='delete_order'),
url(r'create-virtual-machine/?$', CreateVirtualMachinesView.as_view(), name='create-virtual-machine'),
url(r'create-virtual-machine/?$', CreateVirtualMachinesView.as_view(), name='create_virtual_machine'),
url(r'my-virtual-machines/?$', VirtualMachinesPlanListView.as_view(), name='virtual_machines'),
url(r'my-virtual-machines/(?P<pk>\d+)/?$', VirtualMachineView.as_view(),
name='virtual_machines'),

View file

@ -324,7 +324,7 @@ class GenerateVMSSHKeysView(LoginRequiredMixin, FormView):
'private_key': form.cleaned_data.get('private_key'),
'key_name': form.cleaned_data.get('name'),
'form': UserHostingKeyForm(request=self.request),
'next_url': self.request.session.get('next', None)
'next_url': reverse('hosting:create_virtual_machine')
})
# return HttpResponseRedirect(reverse('hosting:key_pair'))