Merge "Restores deletion in flat network topology"
This commit is contained in:
commit
7ff5ef371a
|
@ -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>
|
||||
|
|
|
@ -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();
|
||||
|
|
Loading…
Reference in New Issue