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

GUACAMOLE-220: Select from multiple datasources deterministically.

Browse Source
This commit is contained in:
Michael Jumper
2018-08-08 22:56:07 -07:00
parent 8ad3f25371
commit 6aaef7685f
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
guacamole/src/main/webapp/app/manage/directives/dataSourceTabs.js
View File

@@ -76,9 +76,12 @@ angular.module('manage').directive('dataSourceTabs', ['$injector',
$scope.$watch('permissions', function permissionsChanged(permissions) {
$scope.pages = [];
angular.forEach(permissions, function addDataSourcePage(managementPermissions, dataSource) {
var dataSources = _.keys($scope.permissions).sort();
angular.forEach(dataSources, function addDataSourcePage(dataSource) {
// Determine whether data source contains this object
var managementPermissions = permissions[dataSource];
var exists = !!managementPermissions.identifier;
// Data source is not relevant if the associated object does not

4
guacamole/src/main/webapp/app/settings/directives/guacSettingsUserGroups.js
View File

@@ -119,9 +119,11 @@ angular.module('settings').directive('guacSettingsUserGroups', ['$injector',
return null;
// For each data source
for (var dataSource in permissions) {
var dataSources = _.keys(permissions).sort();
for (var i = 0; i < dataSources.length; i++) {
// Retrieve corresponding permission set
var dataSource = dataSources[i];
var permissionSet = permissions[dataSource];
// Can create user groups if adminstrator or have explicit permission

4
guacamole/src/main/webapp/app/settings/directives/guacSettingsUsers.js
View File

@@ -150,9 +150,11 @@ angular.module('settings').directive('guacSettingsUsers', [function guacSettings
return null;
// For each data source
for (var dataSource in $scope.permissions) {
var dataSources = _.keys($scope.permissions).sort();
for (var i = 0; i < dataSources.length; i++) {
// Retrieve corresponding permission set
var dataSource = dataSources[i];
var permissionSet = $scope.permissions[dataSource];
// Can create users if adminstrator or have explicit permission