You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by mj...@apache.org on 2017/09/03 20:55:25 UTC
[1/2] incubator-guacamole-client git commit: GUACAMOLE-358: Allow
settings page to load even if permissions cannot be loaded.
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 <vn...@apache.org>
Authored: Fri Aug 11 12:57:41 2017 -0400
Committer: Nick Couchman <vn...@apache.org>
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;
});
/**
[2/2] incubator-guacamole-client git commit: GUACAMOLE-358: Merge fix
addressing failure to load settings screen.
Posted by mj...@apache.org.
GUACAMOLE-358: Merge fix addressing failure to load settings screen.
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/96e9318d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/96e9318d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/96e9318d
Branch: refs/heads/master
Commit: 96e9318dbcb17539ca5cfd5fff86ac04ebdbd399
Parents: a5ebc07 252c447
Author: Michael Jumper <mj...@apache.org>
Authored: Sun Sep 3 13:53:17 2017 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Sun Sep 3 13:53:17 2017 -0700
----------------------------------------------------------------------
.../webapp/app/settings/directives/guacSettingsPreferences.js | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------