diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2018-03-01 20:13:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-01 20:13:01 +0100 |
| commit | e1e16510a87226d2118631c50509ded0c041d51f (patch) | |
| tree | 8f2067b871625b0974dcb3b714bb51f0ae0f91b7 | |
| parent | effc00c94005a36b0a2e106975f4ec07ba03edb5 (diff) | |
| parent | aa0190dff1c63ad9176dbe7b74055030a7f5dc82 (diff) | |
| download | nextcloud-server-e1e16510a87226d2118631c50509ded0c041d51f.tar.gz nextcloud-server-e1e16510a87226d2118631c50509ded0c041d51f.zip | |
Merge pull request #8587 from nextcloud/email-to-new-user-fix
Fixed email form on new user
| -rw-r--r-- | settings/js/users/users.js | 15 | ||||
| -rw-r--r-- | settings/templates/users/part.userlist.php | 2 |
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> |