openstack
/
horizon
Code Issues Proposed changes

Fixes the deletion on click action assignment 

Changes the selector used to assign the delete on
click action to the correct button in the modal
confirmation dialog.

In addition, the code that hides the "working"
modal to the success handler of said delete action;
the modal should now appear while elements are
actually being deleted and disappearing after
the operation finishes.

Closes-Bug: 1733324
Change-Id: Ia14c263ed49c6f9705dbe12e8108a2c8c858aa31
This commit is contained in:
Marek Lycka 2017-11-20 14:07:03 +01:00
parent 2c5ca1b6e7
commit 8aff865ee6
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openstack_dashboard/static/js/horizon.networktopology.js
View File

@ -209,6 +209,7 @@ horizon.network_topology = {
handleMessage:function(message) {
var self = this;
var deleteData = horizon.networktopologymessager.delete_data;
horizon.modals.spinner.modal('hide');
if (message.type == 'success') {
self.remove_node_on_delete(deleteData);
}
@ -1062,20 +1063,18 @@ horizon.network_topology = {
_balloon.find('.delete-device').click(function() {
var _this = angular.element(this);
var delete_modal = horizon.datatables.confirm(_this);
delete_modal.find('.btn-primary').click(function () {
delete_modal.find('.btn.btn-danger').click(function () {
_this.prop('disabled', true);
d3.select('#id_' + _this.data('device-id')).classed('loading',true);
self.delete_device(_this.data('type'),_this.data('device-id'));
horizon.modals.spinner.modal('hide');
});
});
_balloon.find('.delete-port').click(function() {
var _this = angular.element(this);
var delete_modal = horizon.datatables.confirm(_this);
delete_modal.find('.btn-primary').click(function () {
delete_modal.find('.btn.btn-danger').click(function () {
_this.prop('disabled', true);
self.delete_port(_this.data('router-id'),_this.data('port-id'),_this.data('network-id'));
horizon.modals.spinner.modal('hide');
});
});
self.balloonID = balloonID;