summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2018-02-28 16:28:40 +0100
committerJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2018-02-28 16:28:40 +0100
commitaa0190dff1c63ad9176dbe7b74055030a7f5dc82 (patch)
treefb4ed1f158bf8107f094d05fcf0a74d363bc8c69 /settings
parent0cfdf4748f248e1b55fc459a05e7782a1e585716 (diff)
downloadnextcloud-server-aa0190dff1c63ad9176dbe7b74055030a7f5dc82.tar.gz
nextcloud-server-aa0190dff1c63ad9176dbe7b74055030a7f5dc82.zip
Fixed email form on new user
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'settings')
-rw-r--r--settings/js/users/users.js15
-rw-r--r--settings/templates/users/part.userlist.php2
2 files changed, 1 insertions, 16 deletions
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index d00423a99f3..9bbdd48e99e 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -1048,21 +1048,6 @@ $(document).ready(function () {
}));
return false;
}
- if ($.trim(password) === '' && !$('#CheckboxMailOnUserCreate').is(':checked')) {
- OC.Notification.showTemporary(t('settings', 'Error creating user: {message}', {
- message: t('settings', 'A valid password must be provided')
- }));
- return false;
- }
- if (!$('#CheckboxMailOnUserCreate').is(':checked')) {
- email = '';
- }
- if ($('#CheckboxMailOnUserCreate').is(':checked') && $.trim(email) === '') {
- OC.Notification.showTemporary(t('settings', 'Error creating user: {message}', {
- message: t('settings', 'A valid email must be provided')
- }));
- return false;
- }
var promise;
if (UserDeleteHandler) {
diff --git a/settings/templates/users/part.userlist.php b/settings/templates/users/part.userlist.php
index 9e6866b196d..5a37c968d1e 100644
--- a/settings/templates/users/part.userlist.php
+++ b/settings/templates/users/part.userlist.php
@@ -33,7 +33,7 @@
autocomplete="off" autocapitalize="none" autocorrect="off" />
</td>
<td class="password">
- <input id="newuserpassword" type="password" required
+ <input id="newuserpassword" type="password"
placeholder="<?php p($l->t('Password'))?>" name="password"
autocomplete="new-password" autocapitalize="none" autocorrect="off" />
</td>