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

M #~: Fix nics alias in flow form (#1000)

Browse Source
This commit is contained in:
Sergio Betanzos 2021-03-18 18:00:21 +01:00 committed by GitHub
parent d638412a05
commit 41ae39e41e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/sunstone/public/app/tabs/oneflow-services-tab/utils/role-tab.js
View File

@ -110,7 +110,7 @@ define(function(require) {
var name = $(this).val();
if (this.checked) {
that.nics_template[index] = { "NAME": "NIC"+index, "NETWORK_ID": "$"+name };
that.nics_template[index] = { "NAME": "_NIC"+index, "NETWORK_ID": "$"+name };
$("#alias_"+this.id, role_section).prop("disabled", false);
$("td.parent_selector select:visible", role_section).each(function() {
updateOptionsParents(this, that.nics_template, that.alias_template);
@ -158,7 +158,7 @@ define(function(require) {
toogleNicUsedAsAlias(role_section, this, prevIndexParent, indexParent)
if (that.nics_template[indexParent] && that.alias_template[index]) {
that.alias_template[index]["PARENT"] = "NIC"+indexParent;
that.alias_template[index]["PARENT"] = "_NIC"+indexParent;
}
});
@ -267,7 +267,7 @@ define(function(require) {
var nicTemplate = nic[1];
if (nicTemplate["PARENT"]) {
var indexParent = nicTemplate["PARENT"].replace("NIC", "");
var indexParent = nicTemplate["PARENT"].replace("_NIC", "");
select.val(indexParent).change();
}
});
@ -379,7 +379,7 @@ define(function(require) {
$.each(network_names, function(index, name) {
$.each(nics, function(_, nic) {
if (nic["NETWORK_ID"] === "$"+name){
nic["NAME"] = "NIC"+index;
nic["NAME"] = "_NIC"+index;
$(".service_network_checkbox[data-index='"+index+"']", context).attr('checked', true).change();
that.nics_template[String(index)] = nic;
@ -395,7 +395,7 @@ define(function(require) {
$.each(network_names, function(index, name) {
$.each(alias, function(_, nic) {
if (nic["NETWORK_ID"] === "$"+name){
nic["NAME"] = "NIC"+index;
nic["NAME"] = "_NIC"+index;
$(".service_network_checkbox[data-index='"+index+"']", context).attr('checked', true).change();
$(".alias_network_checkbox[data-index='"+index+"']", context).attr('checked', true).change();
@ -481,11 +481,11 @@ define(function(require) {
$.each(checkedNetworks, function(index, nic) {
if (nic && that.nics_template[index]) {
if (that.nics_template[index]) {
that.nics_template[index]["NAME"] = "NIC"+index;
that.nics_template[index]["NAME"] = "_NIC"+index;
that.nics_template[index]["NETWORK_ID"] = "$"+nic.name;
}
else if (nic && that.alias_template[index]) {
that.alias_template[index]["NAME"] = "NIC"+index;
that.alias_template[index]["NAME"] = "_NIC"+index;
that.alias_template[index]["NETWORK_ID"] = "$"+nic.name;
}
}

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

@ -110,7 +110,7 @@ define(function(require) {
var name = $(this).val();
if (this.checked) {
that.nics_template[index] = { "NAME": "NIC"+index, "NETWORK_ID": "$"+name };
that.nics_template[index] = { "NAME": "_NIC"+index, "NETWORK_ID": "$"+name };
$("#alias_"+this.id, role_section).prop("disabled", false);
$("td.parent_selector select:visible", role_section).each(function() {
updateOptionsParents(this, that.nics_template, that.alias_template);
@ -158,7 +158,7 @@ define(function(require) {
toogleNicUsedAsAlias(role_section, this, prevIndexParent, indexParent)
if (that.nics_template[indexParent] && that.alias_template[index]) {
that.alias_template[index]["PARENT"] = "NIC"+indexParent;
that.alias_template[index]["PARENT"] = "_NIC"+indexParent;
}
});
@ -267,7 +267,7 @@ define(function(require) {
var nicTemplate = nic[1];
if (nicTemplate["PARENT"]) {
var indexParent = nicTemplate["PARENT"].replace("NIC", "");
var indexParent = nicTemplate["PARENT"].replace("_NIC", "");
select.val(indexParent).change();
}
});
@ -377,7 +377,7 @@ define(function(require) {
$.each(network_names, function(index, name) {
$.each(nics, function(_, nic) {
if (nic["NETWORK_ID"] === "$"+name){
nic["NAME"] = "NIC"+index;
nic["NAME"] = "_NIC"+index;
$(".service_network_checkbox[data-index='"+index+"']", context).attr('checked', true).change();
that.nics_template[String(index)] = nic;
@ -393,7 +393,7 @@ define(function(require) {
$.each(network_names, function(index, name) {
$.each(alias, function(_, nic) {
if (nic["NETWORK_ID"] === "$"+name){
nic["NAME"] = "NIC"+index;
nic["NAME"] = "_NIC"+index;
$(".service_network_checkbox[data-index='"+index+"']", context).attr('checked', true).change();
$(".alias_network_checkbox[data-index='"+index+"']", context).attr('checked', true).change();
@ -479,11 +479,11 @@ define(function(require) {
$.each(checkedNetworks, function(index, nic) {
if (nic && that.nics_template[index]) {
if (that.nics_template[index]) {
that.nics_template[index]["NAME"] = "NIC"+index;
that.nics_template[index]["NAME"] = "_NIC"+index;
that.nics_template[index]["NETWORK_ID"] = "$"+nic.name;
}
else if (nic && that.alias_template[index]) {
that.alias_template[index]["NAME"] = "NIC"+index;
that.alias_template[index]["NAME"] = "_NIC"+index;
that.alias_template[index]["NETWORK_ID"] = "$"+nic.name;
}
}