apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 11:52:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

WIP

Browse Source
This commit is contained in:
Brian Federle 2013-04-08 16:37:27 -07:00
parent 4f5d311848
commit 564a850f1b
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/scripts/instances.js
View File

@ -1284,7 +1284,7 @@
},
// Remove NIC/Network from VM
remove: {
destroy: {
label: 'label.action.delete.network',
messages: {
confirm: function(args) {

7
ui/scripts/ui/widgets/detailView.js
View File

@ -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,