diff --git a/app/portainer/components/accessControlForm/porAccessControlFormController.js b/app/portainer/components/accessControlForm/porAccessControlFormController.js index 17157e8a5..2af1e8519 100644 --- a/app/portainer/components/accessControlForm/porAccessControlFormController.js +++ b/app/portainer/components/accessControlForm/porAccessControlFormController.js @@ -48,9 +48,9 @@ function ($q, UserService, TeamService, Notifications, Authentication, ResourceC availableUsers: isAdmin ? UserService.users(false) : [] }) .then(function success(data) { - ctrl.availableUsers = data.availableUsers; + ctrl.availableUsers = _.orderBy(data.availableUsers, 'Username', 'asc'); - var availableTeams = data.availableTeams; + var availableTeams = _.orderBy(data.availableTeams, 'Name', 'asc'); ctrl.availableTeams = availableTeams; if (!isAdmin && availableTeams.length === 1) { ctrl.formData.AuthorizedTeams = availableTeams; diff --git a/app/portainer/components/accessControlPanel/porAccessControlPanelController.js b/app/portainer/components/accessControlPanel/porAccessControlPanelController.js index 92b366002..bbba2b351 100644 --- a/app/portainer/components/accessControlPanel/porAccessControlPanelController.js +++ b/app/portainer/components/accessControlPanel/porAccessControlPanelController.js @@ -106,14 +106,14 @@ function ($q, $state, UserService, TeamService, ResourceControlHelper, ResourceC }); }) .then(function success(data) { - ctrl.availableUsers = data.availableUsers; + ctrl.availableUsers = _.orderBy(data.availableUsers, 'Username', 'asc'); angular.forEach(ctrl.availableUsers, function(user) { var found = _.find(ctrl.authorizedUsers, { Id: user.Id }); if (found) { user.selected = true; } }); - ctrl.availableTeams = data.availableTeams; + ctrl.availableTeams = _.orderBy(data.availableTeams, 'Name', 'asc'); angular.forEach(data.availableTeams, function(team) { var found = _.find(ctrl.authorizedTeams, { Id: team.Id }); if (found) { diff --git a/app/portainer/components/accessManagement/porAccessManagementController.js b/app/portainer/components/accessManagement/porAccessManagementController.js index 75e076eb1..3d70ba06f 100644 --- a/app/portainer/components/accessManagement/porAccessManagementController.js +++ b/app/portainer/components/accessManagement/porAccessManagementController.js @@ -88,7 +88,7 @@ class PorAccessManagementController { parent ? parent.TeamAccessPolicies : {}, this.roles ); - this.availableUsersAndTeams = data.availableUsersAndTeams; + this.availableUsersAndTeams = _.orderBy(data.availableUsersAndTeams, 'Name', 'asc'); this.authorizedUsersAndTeams = data.authorizedUsersAndTeams; } catch (err) { this.availableUsersAndTeams = []; diff --git a/app/portainer/views/teams/teamsController.js b/app/portainer/views/teams/teamsController.js index 7f2e4eee0..9786ee495 100644 --- a/app/portainer/views/teams/teamsController.js +++ b/app/portainer/views/teams/teamsController.js @@ -1,3 +1,5 @@ +import _ from 'lodash-es'; + angular.module('portainer.app') .controller('TeamsController', ['$q', '$scope', '$state', 'TeamService', 'UserService', 'ModalService', 'Notifications', 'Authentication', function ($q, $scope, $state, TeamService, UserService, ModalService, Notifications, Authentication) { @@ -84,7 +86,7 @@ function ($q, $scope, $state, TeamService, UserService, ModalService, Notificati .then(function success(data) { var teams = data.teams; $scope.teams = teams; - $scope.users = data.users; + $scope.users = _.orderBy(data.users, 'Username', 'asc'); }) .catch(function error(err) { $scope.teams = []; diff --git a/app/portainer/views/users/usersController.js b/app/portainer/views/users/usersController.js index bba8cb4b7..4977c1848 100644 --- a/app/portainer/views/users/usersController.js +++ b/app/portainer/views/users/usersController.js @@ -1,3 +1,5 @@ +import _ from 'lodash-es'; + angular.module('portainer.app') .controller('UsersController', ['$q', '$scope', '$state', 'UserService', 'TeamService', 'TeamMembershipService', 'ModalService', 'Notifications', 'Authentication', 'SettingsService', function ($q, $scope, $state, UserService, TeamService, TeamMembershipService, ModalService, Notifications, Authentication, SettingsService) { @@ -110,7 +112,7 @@ function ($q, $scope, $state, UserService, TeamService, TeamMembershipService, M var users = data.users; assignTeamLeaders(users, data.memberships); $scope.users = users; - $scope.teams = data.teams; + $scope.teams = _.orderBy(data.teams, 'Name', 'asc'); $scope.AuthenticationMethod = data.settings.AuthenticationMethod; }) .catch(function error(err) {