diff --git a/src/views/users.js b/src/views/users.js index 7a0fda76f..6b7b07508 100644 --- a/src/views/users.js +++ b/src/views/users.js @@ -29,14 +29,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio Client.openSubscriptionSetup($scope.$parent.subscription); }; - // Order matters for permissions used in canEdit - $scope.roles = [ - { id: 'user', name: $translate.instant('users.role.user'), disabled: false }, - { id: 'usermanager', name: $translate.instant('users.role.usermanager'), disabled: true }, - { id: 'admin', name: $translate.instant('users.role.admin'), disabled: true }, - { id: 'owner', name: $translate.instant('users.role.owner'), disabled: true } - ]; - + $scope.roles = []; $scope.allUsers = []; // all the users and not just current page, have to load this for group assignment $scope.userSearchString = ''; @@ -745,11 +738,12 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio Client.onReady(function () { if ($scope.user.isAtLeastAdmin) $scope.directoryConfig.loadDirectoryConfig(); }); Client.onReady(refreshAllUsers); Client.onReady(function () { + // Order matters for permissions used in canEdit $scope.roles = [ - { id: 'user', name: 'User', disabled: false }, - { id: 'usermanager', name: 'User Manager', disabled: false }, - { id: 'admin', name: 'Administrator', disabled: !$scope.user.isAtLeastAdmin }, - { id: 'owner', name: 'Superadmin', disabled: !$scope.user.isAtLeastOwner } + { id: 'user', name: $translate.instant('users.role.user'), disabled: false }, + { id: 'usermanager', name: $translate.instant('users.role.usermanager'), disabled: false }, + { id: 'admin', name: $translate.instant('users.role.admin'), disabled: !$scope.user.isAtLeastAdmin }, + { id: 'owner', name: $translate.instant('users.role.owner'), disabled: !$scope.user.isAtLeastOwner } ]; });