summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkondou <kondou@ts.unde.re>2013-09-13 17:07:23 +0200
committerkondou <kondou@ts.unde.re>2013-09-13 17:07:23 +0200
commit18da2f9cf76815faeaa6ae162fa8af2d80aaeb3e (patch)
tree79820ce19c0177d2c1fd819550a593ca80b22179
parent306a8681c5a4699d2f9e0375922000c85501def3 (diff)
downloadnextcloud-server-18da2f9cf76815faeaa6ae162fa8af2d80aaeb3e.tar.gz
nextcloud-server-18da2f9cf76815faeaa6ae162fa8af2d80aaeb3e.zip
Improve changepassword route naming
-rw-r--r--settings/js/personal.js2
-rw-r--r--settings/js/users.js2
-rw-r--r--settings/routes.php4
3 files changed, 4 insertions, 4 deletions
diff --git a/settings/js/personal.js b/settings/js/personal.js
index e4284c2e8c6..74620f39810 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -52,7 +52,7 @@ $(document).ready(function(){
$('#passwordchanged').hide();
$('#passworderror').hide();
// Ajax foo
- $.post(OC.Router.generate('settings_ajax_changepersonalpassword'), post, function(data){
+ $.post(OC.Router.generate('settings_personal_changepassword'), post, function(data){
if( data.status === "success" ){
$('#pass1').val('');
$('#pass2').val('');
diff --git a/settings/js/users.js b/settings/js/users.js
index e3e749a312e..d800de73f5b 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.Router.generate('settings_ajax_changepassword'),
+ OC.Router.generate('settings_users_changepassword'),
{username: uid, password: $(this).val(), recoveryPassword: recoveryPasswordVal},
function (result) {
if (result.status != 'success') {
diff --git a/settings/routes.php b/settings/routes.php
index 6778a2ab828..60f9d8e1001 100644
--- a/settings/routes.php
+++ b/settings/routes.php
@@ -37,13 +37,13 @@ $this->create('settings_ajax_togglesubadmins', '/settings/ajax/togglesubadmins.p
->actionInclude('settings/ajax/togglesubadmins.php');
$this->create('settings_ajax_removegroup', '/settings/ajax/removegroup.php')
->actionInclude('settings/ajax/removegroup.php');
-$this->create('settings_ajax_changepassword', '/settings/users/changepassword')
+$this->create('settings_users_changepassword', '/settings/users/changepassword')
->post()
->action('OC\Settings\ChangePassword\Controller', 'changeUserPassword');
$this->create('settings_ajax_changedisplayname', '/settings/ajax/changedisplayname.php')
->actionInclude('settings/ajax/changedisplayname.php');
// personal
-$this->create('settings_ajax_changepersonalpassword', '/settings/personal/changepassword')
+$this->create('settings_personal_changepassword', '/settings/personal/changepassword')
->post()
->action('OC\Settings\ChangePassword\Controller', 'changePersonalPassword');
$this->create('settings_ajax_lostpassword', '/settings/ajax/lostpassword.php')