diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles.js b/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles.js index 4bffcc6879..ab93a35c61 100644 --- a/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles.js +++ b/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles.js @@ -234,7 +234,7 @@ define(function(require) { : ""; } - ips = OpenNebulaVM.ipsStr(data, { forceGroup: true }); + ips = OpenNebulaVM.ipsDropdown(data); actions = VMRemoteActions.renderActionsHtml(data); } @@ -348,17 +348,23 @@ define(function(require) { event.stopPropagation(); }); - $("#" + that.serviceroleVMsDataTable.dataTableId).on("change", "tbody input.check_item", function() { - StateRolesVmButtons.disableAllStateActions(); - - // Enable actions available to any of the selected VMs - var nodes = $("tr", that.serviceroleVMsDataTable.dataTable); //visible nodes only - $.each($("input.check_item:checked", nodes), function() { - StateRolesVmButtons.enableStateActions($(this).attr("state"), $(this).attr("lcm_state")); + $("#" + that.serviceroleVMsDataTable.dataTableId) + .on("click", "ul.dropdown-menu-css > .menu-hide", function(event) { + event.stopPropagation(); }); - return true; - }); + $("#" + that.serviceroleVMsDataTable.dataTableId) + .on("change", "tbody input.check_item", function() { + StateRolesVmButtons.disableAllStateActions(); + + // Enable actions available to any of the selected VMs + var nodes = $("tr", that.serviceroleVMsDataTable.dataTable); //visible nodes only + $.each($("input.check_item:checked", nodes), function() { + StateRolesVmButtons.enableStateActions($(this).attr("state"), $(this).attr("lcm_state")); + }); + + return true; + }); } } }); diff --git a/src/sunstone/public/app/tabs/vms-tab/datatable.js b/src/sunstone/public/app/tabs/vms-tab/datatable.js index 7bfcd62bad..567027a1ee 100644 --- a/src/sunstone/public/app/tabs/vms-tab/datatable.js +++ b/src/sunstone/public/app/tabs/vms-tab/datatable.js @@ -183,6 +183,10 @@ define(function(require) { VMRemoteActions.bindActionsToContext("#" + this.dataTableId); + $("#" + this.dataTableId).on("click", "ul.dropdown-menu-css > .menu-hide", function(event) { + event.stopPropagation(); + }); + $("#" + this.dataTableId).on("change", "tbody input.check_item", function() { if ($(this).is(":checked")){ StateActions.enableStateActions($(this).attr("state"), $(this).attr("lcm_state")); diff --git a/src/sunstone/public/app/utils/info-connection/info.hbs b/src/sunstone/public/app/utils/info-connection/info.hbs index 542a457c61..5600c9fd30 100644 --- a/src/sunstone/public/app/utils/info-connection/info.hbs +++ b/src/sunstone/public/app/utils/info-connection/info.hbs @@ -65,8 +65,8 @@ {{#each networks}} {{#if @first}} {{ this }} {{/if}} {{/each}} -