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

GUACAMOLE-422: Use the same display mechanism and structure (the guacForm directive) for all locale preferences, not just the time zone.

Browse Source
This commit is contained in:
Michael Jumper
2019-06-15 13:43:28 -07:00
parent ec963dd036
commit 78977ae4fc
3 changed files with 35 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
guacamole/src/main/webapp/app/settings/directives/guacSettingsPreferences.js
View File

@@ -39,7 +39,6 @@ angular.module('settings').directive('guacSettingsPreferences', [function guacSe
var $translate = $injector.get('$translate');
var authenticationService = $injector.get('authenticationService');
var guacNotification = $injector.get('guacNotification');
var languageService = $injector.get('languageService');
var permissionService = $injector.get('permissionService');
var preferenceService = $injector.get('preferenceService');
var requestService = $injector.get('requestService');
@@ -78,21 +77,23 @@ angular.module('settings').directive('guacSettingsPreferences', [function guacSe
* @type Object.<String, Object>
*/
$scope.preferences = preferenceService.preferences;
/**
* A map of all available language keys to their human-readable
* names.
*
* @type Object.<String, String>
* The fields which should be displayed for choosing locale
* preferences. Each field name must be a property on
* $scope.preferences.
*
* @type Field[]
*/
$scope.languages = null;
/**
* Switches the active display langugae to the chosen language.
*/
$scope.changeLanguage = function changeLanguage() {
$translate.use($scope.preferences.language);
};
$scope.localeFields = [
{ 'type' : 'LANGUAGE', 'name' : 'language' },
{ 'type' : 'TIMEZONE', 'name' : 'timezone' }
];
// Automatically update applied translation when language preference is changed
$scope.$watch('preferences.language', function changeLanguage(language) {
$translate.use(language);
});
/**
* The new password for the user.
@@ -169,17 +170,6 @@ angular.module('settings').directive('guacSettingsPreferences', [function guacSe
};
// Retrieve defined languages
languageService.getLanguages()
.then(function languagesRetrieved(languages) {
$scope.languages = Object.keys(languages).map(function(key) {
return {
key: key,
value: languages[key]
};
});
}, requestService.DIE);
// Retrieve current permissions
permissionService.getEffectivePermissions(dataSource, username)
.then(function permissionsRetrieved(permissions) {