You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by mj...@apache.org on 2018/03/03 20:23:30 UTC
[4/5] guacamole-client git commit: GUACAMOLE-508: More comment clean
up.
GUACAMOLE-508: More comment clean up.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/0111b031
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/0111b031
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/0111b031
Branch: refs/heads/master
Commit: 0111b031e8374ddc1a39239aa4d0843f5ccca72d
Parents: 8ad579b
Author: Nick Couchman <vn...@apache.org>
Authored: Sat Mar 3 07:49:54 2018 -0500
Committer: Nick Couchman <vn...@apache.org>
Committed: Sat Mar 3 07:49:54 2018 -0500
----------------------------------------------------------------------
.../main/webapp/app/navigation/services/userPageService.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/0111b031/guacamole/src/main/webapp/app/navigation/services/userPageService.js
----------------------------------------------------------------------
diff --git a/guacamole/src/main/webapp/app/navigation/services/userPageService.js b/guacamole/src/main/webapp/app/navigation/services/userPageService.js
index b9144a6..749564b 100644
--- a/guacamole/src/main/webapp/app/navigation/services/userPageService.js
+++ b/guacamole/src/main/webapp/app/navigation/services/userPageService.js
@@ -61,8 +61,6 @@ angular.module('navigation').factory('userPageService', ['$injector',
* A map of all permissions granted to the current user, where each
* key is the identifier of the corresponding data source.
*
- * @param {Object.<String,
- *
* @returns {PageDefinition}
* The user's home page.
*/
@@ -71,8 +69,10 @@ angular.module('navigation').factory('userPageService', ['$injector',
var homePage = null;
var settingsPages = generateSettingsPages(permissions);
- // If we have more than one setting page, return the main home page
- // and don't worry about checking for a single connection.
+ // If user has access to settings pages, return home page and skip
+ // evaluation for automatic connections. The Preferences page is
+ // a Settings page and is always visible, so we look for more than
+ // one to indicate access to administrative pages.
if (settingsPages.length > 1)
return SYSTEM_HOME_PAGE;