From 4f9440aaeb19e5b6580c607d462ca4c302136944 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Thu, 3 Sep 2015 13:53:40 -0700 Subject: [PATCH] GUAC-586: Fix logic error in home page calculation. --- .../main/webapp/app/navigation/services/userPageService.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/guacamole/src/main/webapp/app/navigation/services/userPageService.js b/guacamole/src/main/webapp/app/navigation/services/userPageService.js index 27878ceb8..782f3fce7 100644 --- a/guacamole/src/main/webapp/app/navigation/services/userPageService.js +++ b/guacamole/src/main/webapp/app/navigation/services/userPageService.js @@ -78,9 +78,12 @@ angular.module('navigation').factory('userPageService', ['$injector', var connections = rootGroup.childConnections || []; 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 // that as the home page - if (homePage === null && connections.length + connectionGroups.length === 1) { + if (homePage === null && totalRootObjects === 1) { var connection = connections[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 // home page - else { + else if (totalRootObjects >= 1) { homePage = null; break; }