diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index f30e8d370bb..a3b8abb9775 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -1491,7 +1491,7 @@ }, // Remove NIC/Network from VM - destroy: { + remove: { label: 'label.action.delete.nic', messages: { confirm: function(args) { diff --git a/ui/scripts/ui/widgets/detailView.js b/ui/scripts/ui/widgets/detailView.js index 0b16d2d3769..ea6c3a24bd9 100644 --- a/ui/scripts/ui/widgets/detailView.js +++ b/ui/scripts/ui/widgets/detailView.js @@ -302,29 +302,36 @@ }, remove: function($detailView, args) { + var tab = args.tabs[args.activeTab]; + var isMultiple = tab.multiple; + uiActions.standard($detailView, args, { noRefresh: true, complete: function(args) { - var $browser = $('#browser .container'); - var $panel = $detailView.closest('.panel'); + if (isMultiple) { + $detailView.find('.refresh').click(); // Reload tab + } else { + var $browser = $('#browser .container'); + var $panel = $detailView.closest('.panel'); - if ($detailView.is(':visible')) { - $browser.cloudBrowser('selectPanel', { - panel: $panel.prev() - }); - } - - if($detailView.data("list-view-row") != null) { - var $row = $detailView.data('list-view-row'); - var $tbody = $row.closest('tbody'); - - $row.remove(); - if(!$tbody.find('tr').size()) { - $("