wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow user to set an empty email address

Browse source 
* fixes #16057
This commit is contained in:
Morris Jobke 2015-05-05 11:58:19 +02:00
parent 179472aeef
commit 5fd849f545
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
settings/controller/userscontroller.php
View file

@ -504,7 +504,12 @@ class UsersController extends Controller {
);
}
$this->config->setUserValue($id, 'settings', 'email', $mailAddress);
// delete user value if email address is empty
if($mailAddress === '') {
$this->config->deleteUserValue($id, 'settings', 'email');
} else {
$this->config->setUserValue($id, 'settings', 'email', $mailAddress);
}
return new DataResponse(
array(

9
settings/js/personal.js
View file

@ -12,8 +12,9 @@
* user or 1 second after the last data entry
*
* @param callback
* @param allowEmptyValue if this is set to true the callback is also called when the value is empty
*/
jQuery.fn.keyUpDelayedOrEnter = function (callback) {
jQuery.fn.keyUpDelayedOrEnter = function (callback, allowEmptyValue) {
var cb = callback;
var that = this;
this.keyup(_.debounce(function (event) {
@ -21,13 +22,13 @@ jQuery.fn.keyUpDelayedOrEnter = function (callback) {
if (event.keyCode === 13) {
return;
}
if (that.val() !== '') {
if (allowEmptyValue || that.val() !== '') {
cb();
}
}, 1000));
this.keypress(function (event) {
if (event.keyCode === 13 && that.val() !== '') {
if (event.keyCode === 13 && (allowEmptyValue || that.val() !== '')) {
event.preventDefault();
cb();
}
@ -213,7 +214,7 @@ $(document).ready(function () {
});
$('#displayName').keyUpDelayedOrEnter(changeDisplayName);
$('#email').keyUpDelayedOrEnter(changeEmailAddress);
$('#email').keyUpDelayedOrEnter(changeEmailAddress, true);
$("#languageinput").change(function () {
// Serialize the data