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

GUACAMOLE-598: Abort rendering of pages if critical data fails to load (data without which the page is non-functional).

Browse Source
This commit is contained in:
Michael Jumper
2018-06-26 22:49:06 -07:00
parent c897c7eb26
commit 5866c7e251
16 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -111,7 +111,7 @@ angular.module('navigation').directive('guacUserMenu', [function guacUserMenu()
var email = user.attributes[User.Attributes.EMAIL_ADDRESS];
$scope.userURL = email ? 'mailto:' + email : null;
}, requestService.WARN);
}, requestService.DIE);
/**
* The available main pages for the current user.

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

@@ -172,7 +172,7 @@ angular.module('navigation').factory('userPageService', ['$injector',
})
.then(function rootConnectionGroupsPermissionsRetrieved(data) {
deferred.resolve(generateHomePage(data.rootGroups,data.permissionsSets));
}, requestService.WARN);
}, requestService.DIE);
return deferred.promise;
@@ -336,7 +336,7 @@ angular.module('navigation').factory('userPageService', ['$injector',
// Resolve promise using settings pages derived from permissions
.then(function permissionsRetrieved(permissions) {
deferred.resolve(generateSettingsPages(permissions));
}, requestService.WARN);
}, requestService.DIE);
return deferred.promise;
@@ -417,7 +417,7 @@ angular.module('navigation').factory('userPageService', ['$injector',
.then(function rootConnectionGroupsRetrieved(retrievedRootGroups) {
rootGroups = retrievedRootGroups;
resolveMainPages();
}, requestService.WARN);
}, requestService.DIE);
// Retrieve current permissions
dataSourceService.apply(
@@ -430,7 +430,7 @@ angular.module('navigation').factory('userPageService', ['$injector',
.then(function permissionsRetrieved(retrievedPermissions) {
permissions = retrievedPermissions;
resolveMainPages();
}, requestService.WARN);
}, requestService.DIE);
return deferred.promise;