Repository: incubator-guacamole-client Updated Branches: refs/heads/master a5ebc0734 -> 96e9318db
GUACAMOLE-358: Allow settings page to load even if permissions cannot be loaded. Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/252c4478 Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/252c4478 Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/252c4478 Branch: refs/heads/master Commit: 252c4478b47ac85a290b453815c56f048473168d Parents: a5ebc07 Author: Nick Couchman <[email protected]> Authored: Fri Aug 11 12:57:41 2017 -0400 Committer: Nick Couchman <[email protected]> Committed: Fri Aug 11 12:57:41 2017 -0400 ---------------------------------------------------------------------- .../webapp/app/settings/directives/guacSettingsPreferences.js | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/252c4478/guacamole/src/main/webapp/app/settings/directives/guacSettingsPreferences.js ---------------------------------------------------------------------- diff --git a/guacamole/src/main/webapp/app/settings/directives/guacSettingsPreferences.js b/guacamole/src/main/webapp/app/settings/directives/guacSettingsPreferences.js index 0a3ed6e..d906c3d 100644 --- a/guacamole/src/main/webapp/app/settings/directives/guacSettingsPreferences.js +++ b/guacamole/src/main/webapp/app/settings/directives/guacSettingsPreferences.js @@ -192,6 +192,9 @@ angular.module('settings').directive('guacSettingsPreferences', [function guacSe $scope.canChangePassword = PermissionSet.hasUserPermission(permissions, PermissionSet.ObjectPermissionType.UPDATE, username); + }) + .error(function permissionsFailed(error) { + $scope.canChangePassword = false; }); /**
