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

Allow to specify fallbackEmail during user creation

Browse Source
This commit is contained in:
Johannes Zellner
2021-10-26 23:39:15 +02:00
parent 789438690d
commit d952b4485d
5 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/js/client.js
+1
View File
@@ -1767,6 +1767,7 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
Client.prototype.addUser = function (user, callback) {
var data = {
email: user.email,
fallbackEmail: user.fallbackEmail,
displayName: user.displayName,
role: user.role
};
src/translation/en.json
+3 -1
View File
@@ -243,7 +243,9 @@
"primaryEmail": "Primary email",
"recoveryEmail": "Password recovery email",
"errorDisplayNameRequired": "Name is required",
"activeCheckbox": "User is active"
"activeCheckbox": "User is active",
"displayNamePlaceholder": "Optional. If not provided, user can pick during sign up",
"fallbackEmailPlaceholder": "Optional. If not specified, primary email will be used"
},
"deleteUserDialog": {
"title": "Delete user {{ username }}",
src/translation/ru.json
+2 -1
View File
@@ -1580,7 +1580,8 @@
"pl": "Польский",
"vi": "Вьетнамский",
"zh_Hans": "Китайский (Упрощенный)",
"es": "Испанский"
"es": "Испанский",
"ru": "Русский"
},
"setupAccount": {
"username": "Имя пользователя",
src/views/users.html
+12 -2
View File
@@ -45,7 +45,7 @@
<form name="useradd_form" role="form" ng-submit="useradd.submit()" autocomplete="off">
<div class="form-group" ng-class="{ 'has-error': (useradd_form.displayName.$dirty && useradd_form.displayName.$invalid) || (!useradd_form.displayName.$dirty && useradd.error.displayName) }">
<label class="control-label">{{ 'users.user.fullName' | tr }}</label>
<input type="text" class="form-control" ng-model="useradd.displayName" name="displayName" id="inputUserAddDisplayName" ng-required autofocus autocomplete="off">
<input type="text" class="form-control" ng-model="useradd.displayName" name="displayName" id="inputUserAddDisplayName" autofocus autocomplete="off" placeholder="{{ 'users.user.displayNamePlaceholder' | tr }}">
<div class="control-label" ng-show="(!useradd_form.displayName.$dirty && useradd.error.displayName) || (useradd_form.displayName.$dirty && useradd_form.displayName.$invalid) || (!useradd_form.displayName.$dirty && useradd.error.displayName)">
<small ng-show="useradd_form.displayName.$error.displayName">{{ 'users.user.errorNotValidFullName' | tr }}</small>
<small ng-show="!useradd_form.displayName.$dirty && useradd.error.displayName">{{ useradd.error.displayName }}</small>
@@ -54,7 +54,7 @@
<input type="password" style="display: none;">
<div class="form-group" ng-class="{ 'has-error': (useradd_form.email.$dirty && useradd_form.email.$invalid) || (!useradd_form.email.$dirty && useradd.error.email) }">
<label class="control-label">{{ 'users.user.email' | tr }}</label>
<label class="control-label">{{ 'users.user.primaryEmail' | tr }}</label>
<input type="email" class="form-control" ng-model="useradd.email" name="email" id="inputUserAddEmail" required>
<div class="control-label" ng-show="(!useradd_form.email.$dirty && useradd.error.email) || (useradd_form.email.$dirty && useradd_form.email.$invalid) || (!useradd_form.email.$dirty && useradd.error.email)">
<small ng-show="useradd_form.email.$error.required">{{ 'users.user.errorEmailRequired' | tr }}</small>
@@ -63,6 +63,16 @@
</div>
</div>
<div class="form-group" ng-class="{ 'has-error': (useradd_form.fallbackEmail.$dirty && useradd_form.fallbackEmail.$invalid) || (!useradd_form.fallbackEmail.$dirty && useradd.error.fallbackEmail) }">
<label class="control-label">{{ 'users.user.recoveryEmail' | tr }}</label>
<input type="email" class="form-control" ng-model="useradd.fallbackEmail" name="fallbackEmail" id="inputUserAddFallbackEmail" placeholder="{{ 'users.user.fallbackEmailPlaceholder' | tr }}">
<div class="control-label" ng-show="(!useradd_form.fallbackEmail.$dirty && useradd.error.fallbackEmail) || (useradd_form.fallbackEmail.$dirty && useradd_form.fallbackEmail.$invalid) || (!useradd_form.fallbackEmail.$dirty && useradd.error.fallbackEmail)">
<small ng-show="useradd_form.fallbackEmail.$error.required">{{ 'users.user.errorEmailRequired' | tr }}</small>
<small ng-show="useradd_form.fallbackEmail.$error.fallbackEmail">{{ 'users.user.errorInvalidEmail' | tr }}</small>
<small ng-show="!useradd_form.fallbackEmail.$dirty && useradd.error.fallbackEmail">{{ useradd.error.fallbackEmail }}</small>
</div>
</div>
<div class="form-group" ng-class="{ 'has-error': (useradd_form.username.$dirty && useradd_form.username.$invalid) || (!useradd_form.username.$dirty && useradd.error.username) }">
<label class="control-label">{{ 'users.user.username' | tr }}</label>
<input type="text" class="form-control" ng-model="useradd.username" name="username" id="inputUserAddUsername" placeholder="{{ 'users.user.usernamePlaceholder' | tr }}">
src/views/users.js
+4
View File
@@ -126,6 +126,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
alreadyTaken: false,
error: {},
email: '',
fallbackEmail: '',
username: '',
displayName: '',
selectedGroups: [],
@@ -140,6 +141,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
$scope.useradd.error = {};
$scope.useradd.email = '';
$scope.useradd.fallbackEmail = '';
$scope.useradd.username = '';
$scope.useradd.displayName = '';
$scope.useradd.selectedGroups = [];
@@ -157,12 +159,14 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
$scope.useradd.alreadyTaken = false;
$scope.useradd.error.email = null;
$scope.useradd.error.fallbackEmail = null;
$scope.useradd.error.username = null;
$scope.useradd.error.displayName = null;
var user = {
username: $scope.useradd.username || null,
email: $scope.useradd.email,
fallbackEmail: $scope.useradd.fallbackEmail,
displayName: $scope.useradd.displayName,
role: $scope.useradd.role
};