openstack/horizon
Code Issues Proposed changes

Restores deletion in flat network topology

Browse Source 
- Removes an inappropriate condition for the device deletion button
- Fixes a jquery selector for the confirmation dialog that pops up on
  deletion

Change-Id: I0a4c7dd5782524a875bf208d4ea63ac6df4a62b4
Closes-Bug: 1781911
This commit is contained in:
mareklycka 2018-07-16 15:37:58 +02:00
parent 187e0051e4
commit a42a56f495
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstack_dashboard/dashboards/project/network_topology/templates/network_topology/client_side/_balloon_container.html
View File

@ -22,7 +22,6 @@
[[/console]]
</div>
[[#type]]
[[#allow_delete_subnet]]
<div class="cell delete">
<button class="delete-device btn btn-danger btn-xs [[type]]"
data-type="[[type]]" data-device-id="[[id]]"
@ -30,7 +29,6 @@
[[delete_label]]
</button>
</div>
[[/allow_delete_subnet]]
[[/type]]
</div>
</div>

6
openstack_dashboard/static/js/horizon.flatnetworktopology.js
View File

@ -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();