summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-01-05 15:17:37 +0000
committerGerrit Code Review <review@openstack.org>2019-01-05 15:17:38 +0000
commit911d7d33442101a2ea272a7d74c9939c94c759f5 (patch)
treef633267e6e95a6dd086a71c7aab9233c3c88fed1
parent5b6ee8fd24e66011f02ab05c3dfd92d9b2a36408 (diff)
parentf7dd73008dd6cec63018476711fad83c35dbbb0d (diff)
downloadhorizon-911d7d33442101a2ea272a7d74c9939c94c759f5.tar.gz
Merge "Restores deletion in flat network topology" into stable/queens
-rw-r--r--openstack_dashboard/static/js/horizon.flatnetworktopology.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/openstack_dashboard/static/js/horizon.flatnetworktopology.js b/openstack_dashboard/static/js/horizon.flatnetworktopology.js
index 51c5654a3..944b6f4f1 100644
--- a/openstack_dashboard/static/js/horizon.flatnetworktopology.js
+++ b/openstack_dashboard/static/js/horizon.flatnetworktopology.js
@@ -624,7 +624,7 @@ horizon.flat_network_topology = {
$balloon.find('.delete-device').click(function(){
var $this = $(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'));
@@ -634,7 +634,7 @@ horizon.flat_network_topology = {
$balloon.find('.delete-port').click(function(){
var $this = $(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');
@@ -642,7 +642,7 @@ horizon.flat_network_topology = {
});
self.balloon_id = balloon_id;
},
- delete_balloon:function() {
+ delete_balloon: function() {
var self = this;
if(self.balloon_id) {
$('#' + self.balloon_id).remove();