aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2016-11-05 16:54:37 +0100
committerGitHub <noreply@github.com>2016-11-05 16:54:37 +0100
commitbfd2596381f880c0817d76a87319e89bce798a87 (patch)
treee747e05b123f4993e2b8f507db08b1c7d459cf46
parentca3616cb58fa3102f17ea748d6f7fd7363c80fa2 (diff)
parentfe544d807ad7d8ca40ff6e08e50aecd00a8e268a (diff)
downloadnextcloud-server-bfd2596381f880c0817d76a87319e89bce798a87.tar.gz
nextcloud-server-bfd2596381f880c0817d76a87319e89bce798a87.zip
Merge pull request #2021 from henrymohn/bug-1875_Password-Hint
Removed else statement preventing Success message from displaying cau…
-rw-r--r--settings/js/personal.js21
1 files changed, 10 insertions, 11 deletions
diff --git a/settings/js/personal.js b/settings/js/personal.js
index d61a08794cc..3079cf27e06 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -235,19 +235,18 @@ $(document).ready(function () {
$(".personal-show-label").show();
$('#pass1').val('');
$('#pass2').val('').change();
+ }
+ if (typeof(data.data) !== "undefined") {
+ OC.msg.finishedSaving('#password-error-msg', data);
} else {
- if (typeof(data.data) !== "undefined") {
- OC.msg.finishedSaving('#password-error-msg', data);
- } else {
- OC.msg.finishedSaving('#password-error-msg',
- {
- 'status' : 'error',
- 'data' : {
- 'message' : t('core', 'Unable to change password')
- }
+ OC.msg.finishedSaving('#password-error-msg',
+ {
+ 'status' : 'error',
+ 'data' : {
+ 'message' : t('core', 'Unable to change password')
}
- );
- }
+ }
+ );
}
$(".password-loading").remove();
$("#passwordbutton").removeAttr('disabled');