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

GUAC-586: Ensure page list tabs appear in deterministic order.

Browse Source
This commit is contained in:
Michael Jumper
2015-09-03 15:27:52 -07:00
parent 404909f37c
commit 9ec3ddf357
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
guacamole/src/main/webapp/app/navigation/directives/guacPageList.js
View File

@@ -138,7 +138,7 @@ angular.module('navigation').directive('guacPageList', [function guacPageList()
name : name, name : name,
url : isCurrentPage ? currentURL : page.url, url : isCurrentPage ? currentURL : page.url,
className : page.className, className : page.className,
weight : page.weight || weight weight : page.weight || (weight + i)
}); });
} }

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

@@ -53,6 +53,14 @@ angular.module('navigation').factory('userPageService', ['$injector',
url : '/' url : '/'
}); });
/**
* The identifiers of all data sources currently available to the
* authenticated user.
*
* @type String[]
*/
var dataSources = authenticationService.getAvailableDataSources();
/** /**
* Returns an appropriate home page for the current user. * Returns an appropriate home page for the current user.
* *
@@ -176,9 +184,10 @@ angular.module('navigation').factory('userPageService', ['$injector',
var canManageSessions = []; var canManageSessions = [];
// Inspect the contents of each provided permission set // Inspect the contents of each provided permission set
angular.forEach(permissionSets, function inspectPermissions(permissions, dataSource) { angular.forEach(dataSources, function inspectPermissions(dataSource) {
permissions = angular.copy(permissions); // Copy permissions for current data source
var permissions = angular.copy(permissionSets[dataSource]);
// Ignore permission to update root group // Ignore permission to update root group
PermissionSet.removeConnectionGroupPermission(permissions, PermissionSet.removeConnectionGroupPermission(permissions,