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

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

Browse Source 
Signed-off-by: Jorge Lobo <jlobo@opennebula.systems>
This commit is contained in:
Jorge Lobo 2020-03-25 10:52:57 +01:00 committed by GitHub
parent e01949c57d
commit bc82dfca4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/sunstone/public/app/opennebula/vm.js
View File

@ -755,10 +755,10 @@ define(function(require) {
// Return the IP or several IPs of a VM
function ipsStr(element, divider) {
var divider = divider || "<br>";
var nics = 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) {
@ -776,7 +776,7 @@ define(function(require) {
});
}
if (nics == undefined){
if (nics == undefined || nics == false){
nics = [];
}
@ -784,7 +784,7 @@ define(function(require) {
nics = [nics];
}
if (pci != undefined) {
if (pci != undefined || pci != false) {
if (!$.isArray(pci)) {
pci = [pci];
}
@ -865,23 +865,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

4
src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js
View File

@ -187,9 +187,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";

9
src/sunstone/public/app/utils/labels/utils.js
View File

@ -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] : "");
}
}

2
src/sunstone/public/app/utils/template-utils.js
View File

@ -176,7 +176,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;
}