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

GUACAMOLE-360: Allow all users access to the session management page.

Browse Source
This commit is contained in:
Nick Couchman
2018-06-12 09:43:16 -04:00
committed by Nick Couchman
parent 984ab48ce8
commit 3eda313519
1 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,10 +71,10 @@ angular.module('navigation').factory('userPageService', ['$injector',
var settingsPages = generateSettingsPages(permissions); var settingsPages = generateSettingsPages(permissions);
// If user has access to settings pages, return home page and skip // If user has access to settings pages, return home page and skip
// evaluation for automatic connections. The Preferences page is // evaluation for automatic connections. The Preferences and Session
// a Settings page and is always visible, so we look for more than // Management pages are "Settings" pages and are always visible, so
// one to indicate access to administrative pages. // we look for more than two to indicate access to administrative pages.
if (settingsPages.length > 1) if (settingsPages.length > 2)
return SYSTEM_HOME_PAGE; return SYSTEM_HOME_PAGE;
// Determine whether a connection or balancing group should serve as // Determine whether a connection or balancing group should serve as
@@ -257,25 +257,16 @@ angular.module('navigation').factory('userPageService', ['$injector',
canManageConnections.push(dataSource); canManageConnections.push(dataSource);
} }
// Determine whether the current user needs access to the session management UI or view connection history // Determine whether the current user needs access to view connection history
if ( if (
// A user must be a system administrator to manage sessions // A user must be a system administrator to view connection records
PermissionSet.hasSystemPermission(permissions, PermissionSet.SystemPermissionType.ADMINISTER) PermissionSet.hasSystemPermission(permissions, PermissionSet.SystemPermissionType.ADMINISTER)
) { ) {
canManageSessions.push(dataSource);
canViewConnectionRecords.push(dataSource); canViewConnectionRecords.push(dataSource);
} }
}); });
// If user can manage sessions, add link to sessions management page
if (canManageSessions.length) {
pages.push(new PageDefinition({
name : 'USER_MENU.ACTION_MANAGE_SESSIONS',
url : '/settings/sessions'
}));
}
// If user can manage connections, add links for connection management pages // If user can manage connections, add links for connection management pages
angular.forEach(canViewConnectionRecords, function addConnectionHistoryLink(dataSource) { angular.forEach(canViewConnectionRecords, function addConnectionHistoryLink(dataSource) {
pages.push(new PageDefinition({ pages.push(new PageDefinition({
@@ -306,6 +297,12 @@ angular.module('navigation').factory('userPageService', ['$injector',
})); }));
}); });
// Add link to session management (always accessible)
pages.push(new PageDefinition({
name : 'USER_MENU.ACTION_MANAGE_SESSIONS',
url : '/settings/sessions'
}));
// Add link to user preferences (always accessible) // Add link to user preferences (always accessible)
pages.push(new PageDefinition({ pages.push(new PageDefinition({
name : 'USER_MENU.ACTION_MANAGE_PREFERENCES', name : 'USER_MENU.ACTION_MANAGE_PREFERENCES',