From 4172c216f5bb3d94defbc7608f504ad9e2abdf3e Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Tue, 27 Oct 2015 11:28:42 -0400 Subject: [PATCH] (js) Select newly added user in ACLs editor --- UI/WebServerResources/js/Common/Acl.service.js | 2 +- UI/WebServerResources/js/Common/AclController.js | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/UI/WebServerResources/js/Common/Acl.service.js b/UI/WebServerResources/js/Common/Acl.service.js index 6c87d4015..703422e15 100644 --- a/UI/WebServerResources/js/Common/Acl.service.js +++ b/UI/WebServerResources/js/Common/Acl.service.js @@ -98,7 +98,7 @@ user.userClass = user.isGroup ? 'normal-group' : 'normal-user'; user.$rights = angular.bind(user, user.$acl, _this.folderId); _this.users.push(user); - deferred.resolve(_this.users); + deferred.resolve(user); }, function(data, status) { deferred.reject(l('An error occured please try again.')); }); diff --git a/UI/WebServerResources/js/Common/AclController.js b/UI/WebServerResources/js/Common/AclController.js index 2b0a0fdcd..d1aca90f3 100644 --- a/UI/WebServerResources/js/Common/AclController.js +++ b/UI/WebServerResources/js/Common/AclController.js @@ -59,9 +59,12 @@ function addUser(data) { if (data) { - folder.$acl.$addUser(data).then(function() { + folder.$acl.$addUser(data).then(function(user) { vm.userToAdd = ''; vm.searchText = ''; + vm.selectedUid = null; + if (user) + selectUser(user); }, function(error) { Dialog.alert(l('Warning'), error); });