jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Add user role dropdown

Browse Source 
Also pass `role` instead of `permissions`
Once done ng-disable/ng-hide based on userInfo.role
This commit is contained in:
Johannes Zellner
2020-02-21 21:12:25 +01:00
parent 52d454276d
commit 6f12cde2e8
3 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/views/users.js
View File

@@ -25,6 +25,13 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
$scope.config = Client.getConfig();
$scope.userInfo = Client.getUserInfo();
$scope.roles = [
{ id: '', name: 'User' },
{ id: 'manage_users', name: 'User Manager' },
{ id: 'admin', name: 'Administrator' },
{ id: 'owner', name: 'Owner' }
];
$scope.allUsers = [];
$scope.userSearchString = '';
@@ -80,6 +87,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
sendInvite: true,
selectedGroups: [],
admin: false,
role: '',
show: function () {
$scope.useradd.error = {};
@@ -88,6 +96,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
$scope.useradd.displayName = '';
$scope.useradd.selectedGroups = [];
$scope.useradd.admin = false;
$scope.useradd.role = '';
$scope.useradd_form.$setUntouched();
$scope.useradd_form.$setPristine();
@@ -107,7 +116,8 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
username: $scope.useradd.username || null,
email: $scope.useradd.email,
displayName: $scope.useradd.displayName,
admin: $scope.useradd.admin
admin: $scope.useradd.admin,
role: $scope.useradd.role
};
Client.createUser(user, function (error, newUserInfo) {
@@ -211,7 +221,8 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
id: userId,
admin: $scope.useredit.admin,
active: $scope.useredit.active,
permissions: $scope.useredit.role ? [ $scope.useredit.role ] : null
permissions: $scope.useredit.role ? [ $scope.useredit.role ] : null,
role: $scope.useredit.role
};
// only change those if it is a local user