shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

feature #2589: Close the image/template creation dialog only if the call succeeds

Browse Source
This commit is contained in:
Daniel Molina 2014-01-13 16:12:02 +01:00
parent 3e68e53ba2
commit 70f680914b
2 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/sunstone/public/js/plugins/images-tab.js
View File

@ -344,7 +344,10 @@ var image_actions = {
"Image.create" : {
type: "create",
call: OpenNebula.Image.create,
callback: addImageElement,
callback: function(request, response){
addImageElement(request, response);
$create_image_dialog.trigger("reveal:close")
},
error: onError,
notify:true
},
@ -1128,8 +1131,6 @@ function initialize_create_image_dialog(dialog) {
Sunstone.runAction("Image.create", img_obj);
};
dialog.trigger("reveal:close")
return false;
});
@ -1150,7 +1151,7 @@ function initialize_create_image_dialog(dialog) {
"ds_id" : ds_id
};
Sunstone.runAction("Image.create",img_obj);
dialog.trigger("reveal:close")
return false;
});

29
src/sunstone/public/js/plugins/templates-tab.js
View File

@ -311,9 +311,10 @@ var template_actions = {
"Template.create" : {
type: "create",
call: OpenNebula.Template.create,
callback: function(){
callback: function(request, response){
$create_template_dialog.trigger("reveal:close")
$create_template_dialog.empty();
addTemplateElement();
addTemplateElement(request, response);
},
error: onError,
notify:true
@ -371,10 +372,9 @@ var template_actions = {
type: "single",
call: OpenNebula.Template.show,
callback: function(request, response) {
$create_template_dialog.remove();
setupCreateTemplateDialog();
template_to_update_id = response.VMTEMPLATE.ID;
fillTemplatePopUp(
response.VMTEMPLATE.ID,
response.VMTEMPLATE.TEMPLATE,
$create_template_dialog);
popUpUpdateTemplateDialog();
@ -402,7 +402,8 @@ var template_actions = {
"Template.update" : {
type: "single",
call: OpenNebula.Template.update,
callback: function() {
callback: function(request, response){
$create_template_dialog.trigger("reveal:close")
notifyMessage(tr("Template updated correctly"));
},
error: onError
@ -4098,9 +4099,6 @@ function initialize_create_template_dialog(dialog) {
//validate form
Sunstone.runAction("Template.create",vm_json);
dialog.trigger("reveal:close")
return false;
});
@ -4110,9 +4108,6 @@ function initialize_create_template_dialog(dialog) {
vm_json =JSON.stringify(vm_json);
Sunstone.runAction("Template.update",template_to_update_id,vm_json);
dialog.trigger("reveal:close")
return false;
});
@ -4124,9 +4119,6 @@ function initialize_create_template_dialog(dialog) {
var vm_json = JSON.stringify(template);
Sunstone.runAction("Template.update",template_to_update_id,vm_json);
dialog.trigger("reveal:close")
return false;
});
@ -4138,13 +4130,12 @@ function initialize_create_template_dialog(dialog) {
template = {"vmtemplate": {"template_raw": template}};
Sunstone.runAction("Template.create",template);
dialog.trigger("reveal:close")
return false;
});
}
function popUpUpdateTemplateDialog(){
$appmarket_import_dialog.remove();
$create_template_dialog.remove();
// TODO do not recreate if it exists
setupCreateTemplateDialog();
@ -4165,7 +4156,7 @@ function popUpUpdateTemplateDialog(){
};
function popUpCreateTemplateDialog(){
$appmarket_import_dialog.remove();
$create_template_dialog.remove();
// TODO do not recreate if it exists
setupCreateTemplateDialog();
@ -4208,7 +4199,7 @@ function popUpTemplateTemplateUpdateDialog(){
Sunstone.runAction("Template.show_to_update", template_id);
};
function fillTemplatePopUp(template_to_update_id, template, dialog){
function fillTemplatePopUp(template, dialog){
var use_advanced_template = false;
function autoFillInputs(template_json, context){