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

delete template action, delete ISO action - use 'remove' instead of 'destroy' since their definitions have been switched.

This commit is contained in:
Jessica Wang 2012-03-02 11:08:23 -08:00
parent 9f260fb37b
commit 27bfd62e0e
2 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/scripts/storage.js
View File

@ -786,7 +786,7 @@
}
},
'remove': {
remove: {
label: 'label.action.delete.volume',
messages: {
confirm: function(args) {
@ -1089,7 +1089,7 @@
}
},
'remove': {
remove: {
label: 'label.action.delete.snapshot',
messages: {
confirm: function(args) {

24
ui/scripts/templates.js
View File

@ -503,7 +503,7 @@
}
},
'delete': {
remove: {
label: 'label.action.delete.template',
messages: {
confirm: function(args) {
@ -526,13 +526,7 @@
var jid = json.deletetemplateresponse.jobid;
args.response.success(
{_custom:
{jobId: jid,
getUpdatedItem: function(json) {
return {}; //nothing in this template needs to be updated, in fact, this whole template has being deleted
},
getActionFilter: function() {
return templateActionfilter;
}
{jobId: jid
}
}
);
@ -1037,7 +1031,7 @@
}
},
'delete': {
remove: {
label: 'label.action.delete.ISO',
messages: {
confirm: function(args) {
@ -1060,13 +1054,7 @@
var jid = json.deleteisosresponse.jobid;
args.response.success(
{_custom:
{jobId: jid,
getUpdatedItem: function(json) {
return {}; //nothing in this ISO needs to be updated, in fact, this whole ISO has being deleted
},
getActionFilter: function() {
return isoActionfilter;
}
{jobId: jid
}
}
);
@ -1224,7 +1212,7 @@
//do nothing
}
else {
allowedActions.push("delete");
allowedActions.push("remove");
}
return allowedActions;
@ -1284,7 +1272,7 @@
//do nothing
}
else {
allowedActions.push("delete");
allowedActions.push("remove");
}
return allowedActions;