Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-23 07:19:41 +02:00
Code Issues Releases Activity

feat(global): introduce user teams and new UAC system (#868)

Browse source
This commit is contained in:
Anthony Lapenna 2017-05-23 20:56:10 +02:00 • committed by GitHub
parent a380fd9adc
commit 5523fc9023
160 changed files with 7112 additions and 3166 deletions
Download patch file Download diff file Expand all files Collapse all files

58
app/components/users/usersController.js
View file

@ -1,6 +1,6 @@
angular.module('users', [])
.controller('UsersController', ['$scope', '$state', 'UserService', 'ModalService', 'Notifications', 'Pagination',
function ($scope, $state, UserService, ModalService, Notifications, Pagination) {
.controller('UsersController', ['$q', '$scope', '$state', 'UserService', 'TeamService', 'TeamMembershipService', 'ModalService', 'Notifications', 'Pagination', 'Authentication',
function ($q, $scope, $state, UserService, TeamService, TeamMembershipService, ModalService, Notifications, Pagination, Authentication) {
$scope.state = {
userCreationError: '',
selectedItemCount: 0,
@ -15,6 +15,7 @@ function ($scope, $state, UserService, ModalService, Notifications, Pagination)
Password: '',
ConfirmPassword: '',
Administrator: false,
Teams: []
};
$scope.order = function(sortType) {
@ -56,20 +57,25 @@ function ($scope, $state, UserService, ModalService, Notifications, Pagination)
};
$scope.addUser = function() {
$('#createUserSpinner').show();
$scope.state.userCreationError = '';
var username = $scope.formValues.Username;
var password = $scope.formValues.Password;
var role = $scope.formValues.Administrator ? 1 : 2;
UserService.createUser(username, password, role)
var teamIds = [];
angular.forEach($scope.formValues.Teams, function(team) {
teamIds.push(team.Id);
});
UserService.createUser(username, password, role, teamIds)
.then(function success(data) {
Notifications.success("User created", username);
Notifications.success('User successfully created', username);
$state.reload();
})
.catch(function error(err) {
$scope.state.userCreationError = err.msg;
Notifications.error('Failure', err, 'Unable to create user');
})
.finally(function final() {
$('#createUserSpinner').hide();
});
};
@ -92,7 +98,7 @@ function ($scope, $state, UserService, ModalService, Notifications, Pagination)
Notifications.success('User successfully deleted', user.Username);
})
.catch(function error(err) {
Notifications.error("Failure", err, 'Unable to remove user');
Notifications.error('Failure', err, 'Unable to remove user');
})
.finally(function final() {
complete();
@ -111,22 +117,46 @@ function ($scope, $state, UserService, ModalService, Notifications, Pagination)
);
};
function fetchUsers() {
function assignTeamLeaders(users, memberships) {
for (var i = 0; i < users.length; i++) {
var user = users[i];
user.isTeamLeader = false;
for (var j = 0; j < memberships.length; j++) {
var membership = memberships[j];
if (user.Id === membership.UserId && membership.Role === 1) {
user.isTeamLeader = true;
user.RoleName = 'team leader';
break;
}
}
}
}
function initView() {
$('#loadUsersSpinner').show();
UserService.users()
var userDetails = Authentication.getUserDetails();
var isAdmin = userDetails.role === 1 ? true: false;
$scope.isAdmin = isAdmin;
$q.all({
users: UserService.users(true),
teams: isAdmin ? TeamService.teams() : UserService.userLeadingTeams(userDetails.ID),
memberships: TeamMembershipService.memberships()
})
.then(function success(data) {
$scope.users = data.map(function(user) {
return new UserViewModel(user);
});
var users = data.users;
assignTeamLeaders(users, data.memberships);
$scope.users = users;
$scope.teams = data.teams;
})
.catch(function error(err) {
Notifications.error("Failure", err, "Unable to retrieve users");
Notifications.error('Failure', err, 'Unable to retrieve users and teams');
$scope.users = [];
$scope.teams = [];
})
.finally(function final() {
$('#loadUsersSpinner').hide();
});
}
fetchUsers();
initView();
}]);