ungleich-public/dynamicweb
6
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Wiki Activity

success modal added

Browse source
This commit is contained in:
Arvind Tiwari 2017-09-18 21:52:59 +05:30
commit 226f744bae
3 changed files with 27 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hosting/static/hosting/js/virtual_machine_detail.js
View file

@ -27,7 +27,7 @@ function VMTerminateSuccess($container, data) {
$container.addClass('terminate-success') $container.addClass('terminate-success')
.find('.vm-item-lg').text(data.text); .find('.vm-item-lg').text(data.text);
$container.find('.btn').remove(); $container.find('.btn').remove();
window.location = data.redirect; $('#terminate-success').modal('show');
} }
function VMTerminateFail($container, data, text) { function VMTerminateFail($container, data, text) {

17
hosting/templates/hosting/virtual_machine_detail.html
View file

@ -116,4 +116,21 @@
</div> </div>
</div> </div>
<!-- / Cancel Modal --> <!-- / Cancel Modal -->
<!-- Success Modal -->
<div class="modal fade" id="terminate-success" tabindex="-1" role="dialog" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
</div>
<div class="modal-body">
<div class="modal-icon"><i class="fa fa-ban" aria-hidden="true"></i></div>
<h4 class="modal-title" id="ModalLabel">{% trans "Your Virtual Machine" %} {{vm.id}} {% trans "was successfully terminated!" %}</h4>
<div class="modal-footer">
<a href="{% url 'hosting:virtual_machines' %}" class="btn btn-danger btn-wide">{% trans "Close" %}</a>
</div>
</div>
</div>
</div>
</div>
<!-- / Cancel Modal -->
{%endblock%} {%endblock%}

10
hosting/views.py
View file

@ -961,7 +961,13 @@ class VirtualMachineView(LoginRequiredMixin, View):
password=owner.password password=owner.password
) )
try:
vm_data = VirtualMachineSerializer(manager.get_vm(vm.id)).data vm_data = VirtualMachineSerializer(manager.get_vm(vm.id)).data
except BaseException:
return redirect(
reverse('hosting:virtual_machines',
kwargs={'pk': opennebula_vm_id})
)
terminated = manager.delete_vm(vm.id) terminated = manager.delete_vm(vm.id)
@ -971,12 +977,10 @@ class VirtualMachineView(LoginRequiredMixin, View):
else: else:
for t in range(15): for t in range(15):
try: try:
manager.get_vm(self.kwargs.get('pk')) manager.get_vm(opennebula_vm_id)
except WrongIdError: except WrongIdError:
response['status'] = True response['status'] = True
response['redirect'] = self.get_success_url()
response['text'] = ugettext('Terminated') response['text'] = ugettext('Terminated')
self.send_mail()
break break
except BaseException: except BaseException:
break break