diff options
| author | kondou <kondou@ts.unde.re> | 2013-09-06 08:05:07 +0200 |
|---|---|---|
| committer | kondou <kondou@ts.unde.re> | 2013-09-06 08:05:07 +0200 |
| commit | a21376480df10fdb96685d0eb2e663d494aed16f (patch) | |
| tree | 942dd1b8d9928828337d982e051b5c7e9e746e21 /settings/js | |
| parent | ea6e74ca9546ca95b3a6372c6106cd8ab2ea2ee9 (diff) | |
| download | nextcloud-server-a21376480df10fdb96685d0eb2e663d494aed16f.tar.gz nextcloud-server-a21376480df10fdb96685d0eb2e663d494aed16f.zip | |
Split personal and user-mgmt password change logic
Diffstat (limited to 'settings/js')
| -rw-r--r-- | settings/js/personal.js | 11 | ||||
| -rw-r--r-- | settings/js/users.js | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/settings/js/personal.js b/settings/js/personal.js index 8ad26c086b5..8cf4754f793 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -52,14 +52,17 @@ $(document).ready(function(){ $('#passwordchanged').hide(); $('#passworderror').hide(); // Ajax foo - $.post( 'ajax/changepassword.php', post, function(data){ + $.post(OC.Router.generate('settings_ajax_changepersonalpassword'), post, function(data){ if( data.status === "success" ){ $('#pass1').val(''); $('#pass2').val(''); $('#passwordchanged').show(); - } - else{ - $('#passworderror').html( data.data.message ); + } else{ + if (typeof(data.data) !== "undefined") { + $('#passworderror').html(data.data.message); + } else { + $('#passworderror').html(t('Unable to change password')); + } $('#passworderror').show(); } }); diff --git a/settings/js/users.js b/settings/js/users.js index ab08d7099c6..e3e749a312e 100644 --- a/settings/js/users.js +++ b/settings/js/users.js @@ -361,7 +361,7 @@ $(document).ready(function () { if ($(this).val().length > 0) { var recoveryPasswordVal = $('input:password[id="recoveryPassword"]').val(); $.post( - OC.filePath('settings', 'ajax', 'changepassword.php'), + OC.Router.generate('settings_ajax_changepassword'), {username: uid, password: $(this).val(), recoveryPassword: recoveryPasswordVal}, function (result) { if (result.status != 'success') { |