M #~: fix roles in services (#4421)

Signed-off-by: Jorge Lobo <jlobo@opennebula.systems>
(cherry picked from commit bc82dfca4f)
This commit is contained in:
Jorge Lobo authored and Tino Vazquez committed 2020-03-25 10:57:08 +01:00
1 parent d0673bfb3a
commit 27607c8bb3
4 files changed
+30 -23

No files matched your search

+21 -17
View File
@@ -754,10 +754,10 @@ define(function(require) {
// Return the IP or several IPs of a VM
function ipsStr(element, divider) {
var divider = divider || "<br>";
var nic = element.TEMPLATE.NIC;
var pci = element.TEMPLATE.PCI;
var nics = element && element.TEMPLATE && element.TEMPLATE.NIC;
var pci = element && element.TEMPLATE && element.TEMPLATE.PCI;
var ips = [];
var monitoring = element.MONITORING;
var monitoring = element && element.MONITORING;
if (monitoring) {
var externalIP;
$.each(EXTERNAL_IP_ATTRS, function(index, IPAttr) {
@@ -775,15 +775,15 @@ define(function(require) {
});
}
if (nic == undefined){
nic = [];
if (nics == undefined || nics == false){
nics = [];
}
if (!$.isArray(nic)) {
nic = [nic];
}
if (pci != undefined) {
if (pci != undefined || pci != false) {
if (!$.isArray(pci)) {
pci = [pci];
}
@@ -852,23 +852,27 @@ define(function(require) {
// returns true if the vnc button should be enabled
function isVNCSupported(element) {
var graphics = element.TEMPLATE.GRAPHICS;
var state = parseInt(element.LCM_STATE);
return (graphics &&
var rtn = false;
if(element && element.TEMPLATE && element.TEMPLATE.GRAPHICS && element.LCM_STATE){
var graphics = element.TEMPLATE.GRAPHICS;
var state = parseInt(element.LCM_STATE);
rtn = graphics &&
graphics.TYPE &&
graphics.TYPE.toLowerCase() == "vnc" &&
$.inArray(state, VNC_STATES) != -1);
graphics.TYPE.toLowerCase() == "vnc" &&
$.inArray(state, VNC_STATES) != -1;
}
return rtn;
}
function isSPICESupported(element) {
var graphics = element.TEMPLATE.GRAPHICS;
var state = parseInt(element.LCM_STATE);
return (graphics &&
var rtn = false;
if(element && element.TEMPLATE && element.TEMPLATE.GRAPHICS && element.LCM_STATE){
rtn = graphics &&
graphics.TYPE &&
graphics.TYPE.toLowerCase() == "spice" &&
$.inArray(state, VNC_STATES) != -1);
$.inArray(state, VNC_STATES) != -1;
}
return rtn;
}
// returns true if the RDP button should be enabled
@@ -97,9 +97,9 @@ define(function(require) {
var type;
if (element.TEMPLATE.VROUTER_ID != undefined){
if (element && element.TEMPLATE && element.TEMPLATE.VROUTER_ID && element.TEMPLATE.VROUTER_ID != undefined){
type = "VR";
} else if (element.USER_TEMPLATE.SERVICE_ID != undefined){
} else if (element && element.USER_TEMPLATE && element.USER_TEMPLATE.SERVICE_ID && element.USER_TEMPLATE.SERVICE_ID != undefined){
type = "FLOW";
} else {
type = "VM";
@@ -369,10 +369,13 @@ define(function (require) {
}
function _labelsStr(elementTemplate) {
if (elementTemplate['BODY'] && elementTemplate["BODY"][LABELS_ATTR.toLowerCase()]) {
return TemplateUtils.htmlEncode(elementTemplate["BODY"][LABELS_ATTR.toLowerCase()]);
if (elementTemplate &&
elementTemplate.BODY &&
elementTemplate.BODY[LABELS_ATTR.toLowerCase()]
) {
return TemplateUtils.htmlEncode(elementTemplate.BODY[LABELS_ATTR.toLowerCase()]);
} else {
return TemplateUtils.htmlEncode(elementTemplate[LABELS_ATTR]);
return TemplateUtils.htmlEncode(elementTemplate && elementTemplate[LABELS_ATTR]? elementTemplate[LABELS_ATTR] : "");
}
}
@@ -174,7 +174,7 @@ define(function(require) {
function _removeHTMLTags(string){
var rtn = string;
if(rtn){
rtn = string.replace(/<[^0-9\s=>]+>/g, '');
rtn = String(string).replace(/<[^0-9\s=>]+>/g, '');
}
return rtn;
}