From a21376480df10fdb96685d0eb2e663d494aed16f Mon Sep 17 00:00:00 2001 From: kondou Date: Fri, 6 Sep 2013 08:05:07 +0200 Subject: Split personal and user-mgmt password change logic --- settings/js/personal.js | 11 +++++++---- settings/js/users.js | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'settings/js') 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') { -- cgit v1.2.3 From 18da2f9cf76815faeaa6ae162fa8af2d80aaeb3e Mon Sep 17 00:00:00 2001 From: kondou Date: Fri, 13 Sep 2013 17:07:23 +0200 Subject: Improve changepassword route naming --- settings/js/personal.js | 2 +- settings/js/users.js | 2 +- settings/routes.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'settings/js') 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') -- cgit v1.2.3 From 45a7b0dbac307df9ea38a914fd3f1cfb9202a994 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Fri, 20 Sep 2013 20:29:15 +0200 Subject: Fix the apps enabling/disabling in settings --- settings/js/apps.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'settings/js') diff --git a/settings/js/apps.js b/settings/js/apps.js index 54810776d2b..a55c55e24cf 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -84,6 +84,7 @@ OC.Settings.Apps = OC.Settings.Apps || { } else { appitem.data('active',false); + element.data('active',false); OC.Settings.Apps.removeNavigation(appid); appitem.removeClass('active'); element.val(t('settings','Enable')); @@ -104,6 +105,7 @@ OC.Settings.Apps = OC.Settings.Apps || { } else { OC.Settings.Apps.addNavigation(appid); appitem.data('active',true); + element.data('active',true); appitem.addClass('active'); element.val(t('settings','Disable')); } @@ -158,7 +160,7 @@ OC.Settings.Apps = OC.Settings.Apps || { if(response.status === 'success'){ var navIds=response.nav_ids; for(var i=0; i< navIds.length; i++){ - $('#apps').children('li[data-id="'+navIds[i]+'"]').remove(); + $('#apps .wrapper').children('li[data-id="'+navIds[i]+'"]').remove(); } } }); -- cgit v1.2.3 From 4907685405ead5df56ef0a5ac0b9af7c86885487 Mon Sep 17 00:00:00 2001 From: kondou Date: Sat, 28 Sep 2013 16:46:53 +0200 Subject: Base defaultavatar text on displayname Fix #4876 --- core/avatar/controller.php | 2 +- core/js/jquery.avatar.js | 6 +++++- settings/js/personal.js | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) (limited to 'settings/js') diff --git a/core/avatar/controller.php b/core/avatar/controller.php index 9f7c0517c4a..22693824461 100644 --- a/core/avatar/controller.php +++ b/core/avatar/controller.php @@ -33,7 +33,7 @@ class Controller { $image->show(); } else { // Signalizes $.avatar() to display a defaultavatar - \OC_JSON::success(); + \OC_JSON::success(array("data"=> array("displayname"=> \OC_User::getDisplayName($user)) )); } } diff --git a/core/js/jquery.avatar.js b/core/js/jquery.avatar.js index f1382fd7d2d..88a4c25d1ee 100644 --- a/core/js/jquery.avatar.js +++ b/core/js/jquery.avatar.js @@ -69,7 +69,11 @@ var url = OC.Router.generate('core_avatar_get', {user: user, size: size})+'?requesttoken='+oc_requesttoken; $.get(url, function(result) { if (typeof(result) === 'object') { - $div.placeholder(user); + if (result.data && result.data.displayname) { + $div.placeholder(user, result.data.displayname); + } else { + $div.placeholder(user); + } } else { if (ie8fix === true) { $div.html(''); diff --git a/settings/js/personal.js b/settings/js/personal.js index eaaca32f5d8..8944a7afa3c 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -34,6 +34,7 @@ function changeDisplayName(){ $('#oldDisplayName').text($('#displayName').val()); // update displayName on the top right expand button $('#expandDisplayName').text($('#displayName').val()); + updateAvatar(); } else{ $('#newdisplayname').val(data.data.displayName); -- cgit v1.2.3 From 24d092c4ba4264deb2b6b57299da2acc2971cedc Mon Sep 17 00:00:00 2001 From: kondou Date: Sat, 28 Sep 2013 17:49:07 +0200 Subject: Have uniform (wrong) indention --- settings/js/personal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'settings/js') diff --git a/settings/js/personal.js b/settings/js/personal.js index 8944a7afa3c..a923b475731 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -34,7 +34,7 @@ function changeDisplayName(){ $('#oldDisplayName').text($('#displayName').val()); // update displayName on the top right expand button $('#expandDisplayName').text($('#displayName').val()); - updateAvatar(); + updateAvatar(); } else{ $('#newdisplayname').val(data.data.displayName); -- cgit v1.2.3