github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(team): fix invalid team leader count (#2811)

pull/2818/head
William 2019-04-05 14:49:08 +13:00 committed by Anthony Lapenna
parent 45113a7ff4
commit c39807e86c
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/portainer/views/teams/edit/teamController.js
View File

@ -112,6 +112,7 @@ function ($q, $scope, $state, $transition$, TeamService, UserService, TeamMember
.then(function success() { .then(function success() {
$scope.users = $scope.users.concat($scope.teamMembers); $scope.users = $scope.users.concat($scope.teamMembers);
$scope.teamMembers = []; $scope.teamMembers = [];
$scope.leaderCount = 0;
Notifications.success('All users successfully removed'); Notifications.success('All users successfully removed');
}) })
.catch(function error(err) { .catch(function error(err) {
@ -123,6 +124,9 @@ function ($q, $scope, $state, $transition$, TeamService, UserService, TeamMember
TeamMembershipService.deleteMembership(user.MembershipId) TeamMembershipService.deleteMembership(user.MembershipId)
.then(function success() { .then(function success() {
removeUserFromArray(user.Id, $scope.teamMembers); removeUserFromArray(user.Id, $scope.teamMembers);
if (user.TeamRole === 'Leader') {
$scope.leaderCount--;
}
$scope.users.push(user); $scope.users.push(user);
Notifications.success('User removed from team', user.Username); Notifications.success('User removed from team', user.Username);
}) })