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

Add optional password field on usercreation

Browse Source
This commit is contained in:
Johannes Zellner
2021-09-16 08:40:25 +02:00
parent 455fbf36e0
commit a6301d2b6c
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/views/users.js
View File

@@ -127,8 +127,8 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
error: {},
email: '',
username: '',
password: '',
displayName: '',
sendInvite: true,
selectedGroups: [],
role: 'user',
@@ -141,6 +141,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
$scope.useradd.error = {};
$scope.useradd.email = '';
$scope.useradd.username = '';
$scope.useradd.password = '';
$scope.useradd.displayName = '';
$scope.useradd.selectedGroups = [];
$scope.useradd.role = 'user';
@@ -157,10 +158,12 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
$scope.useradd.alreadyTaken = false;
$scope.useradd.error.email = null;
$scope.useradd.error.username = null;
$scope.useradd.error.password = null;
$scope.useradd.error.displayName = null;
var user = {
username: $scope.useradd.username || null,
password: $scope.useradd.password || null,
email: $scope.useradd.email,
displayName: $scope.useradd.displayName,
role: $scope.useradd.role
@@ -204,13 +207,8 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
}
var groupIds = $scope.useradd.selectedGroups.map(function (g) { return g.id; });
var NOOP = function (next) { next(); };
async.series([
Client.setGroups.bind(Client, userId, groupIds),
$scope.useradd.sendInvite ? Client.createInvite.bind(Client, userId) : NOOP,
$scope.useradd.sendInvite ? Client.sendInvite.bind(Client, userId) : NOOP
], function (error) {
Client.setGroups(userId, groupIds, function (error) {
$scope.useradd.busy = false;
if (error) return console.error(error);