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: Make session management page always available.

Browse Source
This commit is contained in:
Nick Couchman
2018-06-18 21:12:20 -04:00
parent 6a1b55a327
commit ef7e28d168
1 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,9 +72,11 @@ angular.module('navigation').factory('userPageService', ['$injector',
// 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 page is
// a Settings page and is always visible, so we look for more than // a Settings page and is always visible, and the Session management
// one to indicate access to administrative pages. // page is also available to all users so that they can kill their
if (settingsPages.length > 1) // own session. We look for more than those two pages to determine
// if we should go to the home page.
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
@@ -265,25 +267,8 @@ angular.module('navigation').factory('userPageService', ['$injector',
canViewConnectionRecords.push(dataSource); canViewConnectionRecords.push(dataSource);
} }
// Determine whether the current user needs access to view session management
if (
// Permission to manage active sessions.
PermissionSet.hasSystemPermission(permissions, PermissionSet.SystemPermissionType.ADMINISTER)
|| PermissionSet.hasActiveConnectionPermission(permissions, PermissionSet.ObjectPermissionType.DELETE)
) {
canManageSessions.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({
@@ -320,6 +305,12 @@ angular.module('navigation').factory('userPageService', ['$injector',
url : '/settings/preferences' url : '/settings/preferences'
})); }));
// Add link to Session management (always accessible)
pages.push(new PageDefinition({
name : 'USER_MENU.ACTION_MANAGE_SESSIONS',
url : '/settings/sessions'
}));
return pages; return pages;
}; };