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

B #1417: Fix VM IPs Dropdown (#4701)

Browse Source 
(cherry picked from commit e45a5d48193b062f9ede6fd8906e1797e49dfff6)
This commit is contained in:
Frederick Borges 2020-05-11 19:22:18 +02:00 committed by Tino Vazquez
parent 1793699a29
commit 5708d9a2cd
No known key found for this signature in database
GPG Key ID: 2FE9C32E94AEABBE
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -820,11 +820,11 @@ define(function(require) {
: "--";
};
// Return a dropdown with all the
// Return a dropdown with all the
function ipsDropdown(element, divider) {
var ipsStr = this.ipsStr(element,divider,groupByIpsDropdown);
console.log(ipsStr);
const ips = ipsStr.split('<br>');
if ((ips.length < 2) && (!~ipsStr.indexOf("li"))) return ipsStr;
var html = '<ul class="dropdown menu ips-dropdown" data-dropdown-menu><li><a>Show IPs</a><ul class="menu" style="max-height: 25em; overflow: scroll;">';
@ -851,7 +851,7 @@ define(function(require) {
var templateAlias = Array.isArray(element.TEMPLATE.NIC_ALIAS)
? element.TEMPLATE.NIC_ALIAS : [element.TEMPLATE.NIC_ALIAS];
var alias = templateAlias.find(function(alias) { return alias.NIC_ID === aliasId });
if (alias) {
nicSection.append($("<li/>").append($("<a/>").css({
"color": "gray",
@ -875,7 +875,7 @@ define(function(require) {
var templateAlias = Array.isArray(element.TEMPLATE.NIC_ALIAS)
? element.TEMPLATE.NIC_ALIAS : [element.TEMPLATE.NIC_ALIAS];
var alias = templateAlias.find(function(alias) { return alias.NIC_ID === aliasId });
if (alias) {
nicSection.append($("<p/>").css({
"margin-bottom": 0,
@ -953,10 +953,10 @@ define(function(require) {
) {
var template = element.TEMPLATE;
var state = parseInt(element.LCM_STATE);
if ($.inArray(state, RDP_STATES) != -1 && template.NIC) {
hasRdp = hasRDP(template.NIC);
if (!hasRdp && template.NIC_ALIAS) {
hasRdp = hasRDP(template.NIC_ALIAS);
}
@ -996,7 +996,7 @@ define(function(require) {
return '<button class="vnc remote_vm" data-id="' + id + '">\
<i class="fas fa-desktop"></i></button>';
}
function buttonSpice(id = "") {
return '<button class="spice remote_vm" data-id="' + id + '">\
<i class="fas fa-desktop"></i></button>';