You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2018/05/05 00:59:09 UTC
[1/2] guacamole-client git commit: GUACAMOLE-220: Rely on
managementButtons directive to handle redirect to user list after save.
Repository: guacamole-client
Updated Branches:
refs/heads/master 9b99b1804 -> 242448060
GUACAMOLE-220: Rely on managementButtons directive to handle redirect to user list after save.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/400b8f31
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/400b8f31
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/400b8f31
Branch: refs/heads/master
Commit: 400b8f310e9e5d246620b25ce95334f6057e1fdc
Parents: 9b99b18
Author: Michael Jumper <mj...@apache.org>
Authored: Fri May 4 15:25:05 2018 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Fri May 4 15:59:40 2018 -0700
----------------------------------------------------------------------
.../main/webapp/app/manage/controllers/manageUserController.js | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/400b8f31/guacamole/src/main/webapp/app/manage/controllers/manageUserController.js
----------------------------------------------------------------------
diff --git a/guacamole/src/main/webapp/app/manage/controllers/manageUserController.js b/guacamole/src/main/webapp/app/manage/controllers/manageUserController.js
index 1679886..e4a91db 100644
--- a/guacamole/src/main/webapp/app/manage/controllers/manageUserController.js
+++ b/guacamole/src/main/webapp/app/manage/controllers/manageUserController.js
@@ -416,10 +416,8 @@ angular.module('manage').controller('manageUserController', ['$scope', '$injecto
}
// Upon success, save any changed permissions
- return permissionService.patchPermissions($scope.dataSource, $scope.user.username, $scope.permissionsAdded, $scope.permissionsRemoved)
- .then(function patchedUserPermissions() {
- $location.url('/settings/users');
- });
+ return permissionService.patchPermissions($scope.dataSource, $scope.user.username,
+ $scope.permissionsAdded, $scope.permissionsRemoved);
});
[2/2] guacamole-client git commit: GUACAMOLE-220: Merge rely on
managementButtons directive to handle redirect after save.
Posted by vn...@apache.org.
GUACAMOLE-220: Merge rely on managementButtons directive to handle redirect after save.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/24244806
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/24244806
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/24244806
Branch: refs/heads/master
Commit: 242448060fe1eb96f442b1691600b1aa1d9f83d6
Parents: 9b99b18 400b8f3
Author: Nick Couchman <vn...@apache.org>
Authored: Fri May 4 20:58:25 2018 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Fri May 4 20:58:25 2018 -0400
----------------------------------------------------------------------
.../main/webapp/app/manage/controllers/manageUserController.js | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------