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: Remove unused services from active sessions page.

Browse Source
This commit is contained in:
Michael Jumper
2015-08-27 23:55:42 -07:00
parent f892446e03
commit a3f8888a27
1 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
guacamole/src/main/webapp/app/settings/directives/guacSettingsSessions.js
View File

@@ -45,18 +45,8 @@ angular.module('settings').directive('guacSettingsSessions', [function guacSetti
var $filter = $injector.get('$filter'); var $filter = $injector.get('$filter');
var $translate = $injector.get('$translate'); var $translate = $injector.get('$translate');
var activeConnectionService = $injector.get('activeConnectionService'); var activeConnectionService = $injector.get('activeConnectionService');
var authenticationService = $injector.get('authenticationService');
var connectionGroupService = $injector.get('connectionGroupService'); var connectionGroupService = $injector.get('connectionGroupService');
var guacNotification = $injector.get('guacNotification'); var guacNotification = $injector.get('guacNotification');
var permissionService = $injector.get('permissionService');
/**
* All permissions associated with the current user, or null if the
* user's permissions have not yet been loaded.
*
* @type PermissionSet
*/
$scope.permissions = null;
/** /**
* The ActiveConnectionWrappers of all active sessions accessible * The ActiveConnectionWrappers of all active sessions accessible
@@ -186,12 +176,6 @@ angular.module('settings').directive('guacSettingsSessions', [function guacSetti
}; };
// Query the user's permissions
permissionService.getPermissions(authenticationService.getCurrentUsername())
.success(function permissionsReceived(retrievedPermissions) {
$scope.permissions = retrievedPermissions;
});
// Retrieve all connections // Retrieve all connections
connectionGroupService.getConnectionGroupTree(ConnectionGroup.ROOT_IDENTIFIER) connectionGroupService.getConnectionGroupTree(ConnectionGroup.ROOT_IDENTIFIER)
.success(function connectionGroupReceived(retrievedRootGroup) { .success(function connectionGroupReceived(retrievedRootGroup) {
@@ -237,8 +221,7 @@ angular.module('settings').directive('guacSettingsSessions', [function guacSetti
$scope.isLoaded = function isLoaded() { $scope.isLoaded = function isLoaded() {
return $scope.wrappers !== null return $scope.wrappers !== null
&& $scope.sessionDateFormat !== null && $scope.sessionDateFormat !== null;
&& $scope.permissions !== null;
}; };