safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUAC-586: Fix logic error in home page calculation.

Browse Source
This commit is contained in:
Michael Jumper
2015-09-03 13:53:40 -07:00
parent 7ea05b14f3
commit 4f9440aaeb
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
guacamole/src/main/webapp/app/navigation/services/userPageService.js
View File

@@ -78,9 +78,12 @@ angular.module('navigation').factory('userPageService', ['$injector',
var connections = rootGroup.childConnections || []; var connections = rootGroup.childConnections || [];
var connectionGroups = rootGroup.childConnectionGroups || []; var connectionGroups = rootGroup.childConnectionGroups || [];
// Calculate total number of root-level objects
var totalRootObjects = connections.length + connectionGroups.length;
// If exactly one connection or balancing group is available, use // If exactly one connection or balancing group is available, use
// that as the home page // that as the home page
if (homePage === null && connections.length + connectionGroups.length === 1) { if (homePage === null && totalRootObjects === 1) {
var connection = connections[0]; var connection = connections[0];
var connectionGroup = connectionGroups[0]; var connectionGroup = connectionGroups[0];
@@ -116,7 +119,7 @@ angular.module('navigation').factory('userPageService', ['$injector',
// Otherwise, a connection or balancing group cannot serve as the // Otherwise, a connection or balancing group cannot serve as the
// home page // home page
else { else if (totalRootObjects >= 1) {
homePage = null; homePage = null;
break; break;
} }