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

GUACAMOLE-508: Take user to home page when Settings pages are available.

Browse Source
This commit is contained in:
Nick Couchman
2018-02-19 09:57:07 -05:00
parent 06459629bb
commit b95b1131b6
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,9 +60,13 @@ angular.module('navigation').factory('userPageService', ['$injector',
* @returns {PageDefinition} * @returns {PageDefinition}
* The user's home page. * The user's home page.
*/ */
var generateHomePage = function generateHomePage(rootGroups) { var generateHomePage = function generateHomePage(rootGroups,permissions) {
var homePage = null; var homePage = null;
var settingsPages = generateSettingsPages(permissions);
if (settingsPages.length > 1)
return SYSTEM_HOME_PAGE;
// Determine whether a connection or balancing group should serve as // Determine whether a connection or balancing group should serve as
// the home page // the home page
@@ -140,13 +144,20 @@ angular.module('navigation').factory('userPageService', ['$injector',
var deferred = $q.defer(); var deferred = $q.defer();
// Resolve promise using home page derived from root connection groups // Resolve promise using home page derived from root connection groups
dataSourceService.apply( var getRootGroups = dataSourceService.apply(
connectionGroupService.getConnectionGroupTree, connectionGroupService.getConnectionGroupTree,
authenticationService.getAvailableDataSources(), authenticationService.getAvailableDataSources(),
ConnectionGroup.ROOT_IDENTIFIER ConnectionGroup.ROOT_IDENTIFIER
) );
.then(function rootConnectionGroupsRetrieved(rootGroups) { var getPermissionSets = dataSourceService.apply(
deferred.resolve(generateHomePage(rootGroups)); permissionService.getPermissions,
authenticationService.getAvailableDataSources(),
authenticationService.getCurrentUsername()
);
$q.all([getRootGroups,getPermissionSets])
.then(function rootConnectionGroupsPermissionsRetrieved(data) {
deferred.resolve(generateHomePage(data[0],data[1]));
}); });
return deferred.promise; return deferred.promise;
@@ -342,7 +353,7 @@ angular.module('navigation').factory('userPageService', ['$injector',
var pages = []; var pages = [];
// Get home page and settings pages // Get home page and settings pages
var homePage = generateHomePage(rootGroups); var homePage = generateHomePage(rootGroups, permissions);
var settingsPages = generateSettingsPages(permissions); var settingsPages = generateSettingsPages(permissions);
// Only include the home page in the list of main pages if the user // Only include the home page in the list of main pages if the user
@@ -417,4 +428,4 @@ angular.module('navigation').factory('userPageService', ['$injector',
return service; return service;
}]); }]);