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

admin is now simply a flag

Browse Source
This commit is contained in:
Girish Ramakrishnan
2018-07-26 15:45:52 -07:00
parent 314da7ace8
commit 9e9e651714
6 changed files with 20 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/views/users.js
View File

@@ -76,7 +76,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
displayName: '',
sendInvite: true,
selectedGroups: [],
superuser: false,
admin: false,
show: function () {
$scope.useradd.error = {};
@@ -84,7 +84,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
$scope.useradd.username = '';
$scope.useradd.displayName = '';
$scope.useradd.selectedGroups = [];
$scope.useradd.superuser = false;
$scope.useradd.admin = false;
$scope.useradd_form.$setUntouched();
$scope.useradd_form.$setPristine();
@@ -104,7 +104,8 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
username: $scope.useradd.username || null,
email: $scope.useradd.email,
displayName: $scope.useradd.displayName,
sendInvite: $scope.useradd.sendInvite
sendInvite: $scope.useradd.sendInvite,
admin: $scope.useradd.admin
};
Client.createUser(user, function (error, newUserInfo) {
@@ -146,12 +147,6 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
var groupIds = $scope.useradd.selectedGroups.map(function (g) { return g.id; });
if ($scope.useradd.superuser) {
if (groupIds.indexOf('admin') === -1) groupIds.push('admin');
} else {
groupIds = groupIds.filter(function (groupId) { return groupId !== 'admin'; });
}
Client.setGroups(newUserInfo.id, groupIds, function (error) {
$scope.useradd.busy = false;
@@ -173,7 +168,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
fallbackEmail: '',
aliases: {},
displayName: '',
superuser: false,
admin: false,
selectedGroups: [],
show: function (userInfo) {
@@ -183,7 +178,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
$scope.useredit.fallbackEmail = userInfo.fallbackEmail;
$scope.useredit.userInfo = userInfo;
$scope.useredit.selectedGroups = userInfo.groupIds.map(function (gid) { return $scope.groupsById[gid]; });
$scope.useredit.superuser = userInfo.groupIds.indexOf('admin') !== -1;
$scope.useredit.admin = userInfo.admin;
$scope.useredit_form.$setPristine();
$scope.useredit_form.$setUntouched();
@@ -200,7 +195,8 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
id: userId,
email: $scope.useredit.email,
displayName: $scope.useredit.displayName,
fallbackEmail: $scope.useredit.fallbackEmail
fallbackEmail: $scope.useredit.fallbackEmail,
admin: $scope.useredit.admin
};
Client.updateUser(data, function (error) {
@@ -220,12 +216,6 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
var groupIds = $scope.useredit.selectedGroups.map(function (g) { return g.id; });
if ($scope.useredit.superuser) {
if (groupIds.indexOf('admin') === -1) groupIds.push('admin');
} else {
groupIds = groupIds.filter(function (groupId) { return groupId !== 'admin'; });
}
Client.setGroups(data.id, groupIds, function (error) {
$scope.useredit.busy = false;