shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2024-12-22 13:33:52 +03:00
Code Releases Wiki Activity

B #3832: preserve attributes vmtemplate (#3843)

Browse Source 
Signed-off-by: Jorge Lobo <jlobo@opennebula.systems>
This commit is contained in:
Jorge Lobo 2019-10-14 17:34:35 +02:00 committed by Tino Vázquez
parent 1553e0746a
commit 354cdae4db
1 changed files with 55 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/sunstone/public/app/tabs/templates-tab/form-panels/create-common.js
View File

@ -17,7 +17,7 @@
define(function(require) {
/*
DEPENDENCIES
*/
*/
var Notifier = require("utils/notifier");
var BaseFormPanel = require("utils/form-panels/form-panel");
var Sunstone = require("sunstone");
@ -58,7 +58,7 @@ define(function(require) {
/*
CONSTRUCTOR
*/
*/
function FormPanel() {
var create_title;
@ -224,7 +224,38 @@ define(function(require) {
function _submitWizard(context) {
var templateJSON = this.retrieve(context);
var current = {};
cachedTemplate = OpenNebulaAction.cache("VMTEMPLATE");
if(
this &&
this.resourceId &&
cachedTemplate &&
cachedTemplate.data &&
Array.isArray(cachedTemplate.data)
){
var id = this.resourceId;
var currentTemplate = cachedTemplate.data.filter(function(vmtemplate){
var rtn = false;
if(
vmtemplate &&
vmtemplate.VMTEMPLATE &&
vmtemplate.VMTEMPLATE.TEMPLATE &&
vmtemplate.VMTEMPLATE.ID &&
vmtemplate.VMTEMPLATE.ID === id
){
return vmtemplate.VMTEMPLATE.TEMPLATE;
}
return rtn;
});
if(
currentTemplate &&
currentTemplate[0] &&
currentTemplate[0].VMTEMPLATE &&
currentTemplate[0].VMTEMPLATE.TEMPLATE
){
current = currentTemplate[0].VMTEMPLATE.TEMPLATE;
}
}
if (this.action == "create") {
Sunstone.runAction(this.resource+".create", {"vmtemplate": templateJSON});
return false;
@ -271,17 +302,34 @@ define(function(require) {
disks.push(disk);
});
templateJSON.DISK = disks;
Sunstone.runAction(actionUpdate, resourceId, TemplateUtils.templateToString(templateJSON));
Sunstone.runAction(
actionUpdate,
resourceId,
TemplateUtils.templateToString(
$.extend( current, templateJSON)
)
);
}else{
Sunstone.runAction(actionUpdate, resourceId, TemplateUtils.templateToString(templateJSON));
Sunstone.runAction(
actionUpdate,
resourceId,
TemplateUtils.templateToString(
$.extend( current, templateJSON)
)
);
}
}
}
};
OpenNebulaAction.show(params,OpenNebulaTemplate.resource);
}else{
Sunstone.runAction(actionUpdate, resourceId, TemplateUtils.templateToString(templateJSON));
Sunstone.runAction(
actionUpdate,
resourceId,
TemplateUtils.templateToString(
$.extend( current, templateJSON)
)
);
}
return false;
}