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

B #4238: Fix vnets parameters in oneflow templates (#4237)

Browse Source
This commit is contained in:
Sergio Betanzos 2020-02-24 18:01:38 +01:00 committed by GitHub
parent 6fbb7467df
commit 520eca0801
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/sunstone/public/app/tabs/oneflow-templates-tab/utils/role-tab.js
View File

@ -27,6 +27,7 @@ define(function(require) {
function RoleTab(html_role_id) {
this.html_role_id = html_role_id;
this.old_template = "";
return this;
}
@ -98,22 +99,27 @@ define(function(require) {
$("#tf_btn_elas_policies", role_section).trigger("click");
$("#tf_btn_sche_policies", role_section).trigger("click");
var textareaTemplate = $(".vm_template_contents", role_section);
role_section.on("change", ".service_network_checkbox", role_section, function(){
var vm_template_contents = {};
vm_template_contents["NIC"] = [];
var old_template = $(".vm_template_contents", role_section).val();
if (this.checked) {
if (that.old_template === "") {
var vm_template_contents = { NIC: [] };
$(".service_network_checkbox:checked", role_section).each(function(){
vm_template_contents["NIC"].push({"NETWORK_ID":"$"+$(this).val()});
});
if(old_template != ""){
var template = TemplateUtils.stringToTemplate(old_template);
template["NIC"] = vm_template_contents["NIC"];
$(".vm_template_contents", role_section).val(TemplateUtils.templateToString(template));
return false;
$(".service_network_checkbox:checked", role_section).each(function(){
vm_template_contents["NIC"].push({"NETWORK_ID":"$"+$(this).val()});
});
textareaTemplate.val(TemplateUtils.templateToString(vm_template_contents));
}
else {
textareaTemplate.val(TemplateUtils.stringToTemplate(that.old_template));
}
}
else {
that.old_template = textareaTemplate.val();
textareaTemplate.val("");
}
$(".vm_template_contents", role_section).val(TemplateUtils.templateToString(vm_template_contents));
});
}
@ -200,15 +206,15 @@ define(function(require) {
this.templatesTable.selectResourceTableSelect({ids : value.vm_template});
if (value.vm_template_contents){
$(".vm_template_contents", context).val(value.vm_template_contents);
$(network_names).each(function(){
var reg = new RegExp("\\$"+this+"\\b");
if(reg.exec(value.vm_template_contents) != null){
$(".service_network_checkbox[value='"+this+"']", context).attr('checked', true).change();
}
});
$(".vm_template_contents", context).val(value.vm_template_contents);
}
$("select[name='shutdown_action_role']", context).val(value.shutdown_action);