etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

delete volume action, delete snapshot action, delete router action - use 'remove' instead of 'destroy' since their definitions have been switched. [reviewed-by: Brian]

This commit is contained in:
Jessica Wang 2012-03-01 16:41:04 -08:00
parent 53c8e4fcad
commit 2608e30d39
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/scripts/storage.js
View File

@ -786,7 +786,7 @@
}
},
'destroy': {
'remove': {
label: 'label.action.delete.volume',
messages: {
confirm: function(args) {
@ -1089,7 +1089,7 @@
}
},
'destroy': {
'remove': {
label: 'label.action.delete.snapshot',
messages: {
confirm: function(args) {
@ -1195,7 +1195,7 @@
}
}
else { // Disk not attached
allowedActions.push("destroy");
allowedActions.push("remove");
allowedActions.push("migrateToAnotherStorage");
if (jsonObj.storagetype == "shared") {
allowedActions.push("attachDisk");
@ -1218,7 +1218,7 @@
allowedActions.push("createTemplate");
allowedActions.push("createVolume");
}
allowedActions.push("destroy");
allowedActions.push("remove");
return allowedActions;
}

4
ui/scripts/system.js
View File

@ -2006,7 +2006,7 @@
}
},
'destroy': {
'remove': {
label: 'label.destroy.router',
messages: {
confirm: function(args) {
@ -7303,7 +7303,7 @@
}
else if (jsonObj.state == 'Stopped') {
allowedActions.push("start");
allowedActions.push("destroy");
allowedActions.push("remove");
allowedActions.push("changeService");
}
return allowedActions;