diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index d4cc57f57b9..3c9696da599 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -1284,7 +1284,7 @@ }, // Remove NIC/Network from VM - remove: { + destroy: { label: 'label.action.delete.network', messages: { confirm: function(args) { diff --git a/ui/scripts/ui/widgets/detailView.js b/ui/scripts/ui/widgets/detailView.js index ddb62f02fde..54f4166cae0 100644 --- a/ui/scripts/ui/widgets/detailView.js +++ b/ui/scripts/ui/widgets/detailView.js @@ -57,7 +57,10 @@ * Default behavior for actions -- just show a confirmation popup and add notification */ standard: function($detailView, args, additional) { - var action = args.actions[args.actionName]; + var tab = args.tabs[args.activeTab]; + var isMultiple = tab.multiple; + + var action = isMultiple ? tab.actions[args.actionName] : args.actions[args.actionName]; var preAction = action.preAction; var notification = action.notification ? action.notification : {}; @@ -1078,7 +1081,7 @@ } // Add action bar - if (tabData.actions) { + if (tabData.multiple && tabData.actions) { var $actions = makeActionButtons(tabData.actions, { actionFilter: tabData.actions.actionFilter, data: item,