diff options
| author | Morris Jobke <morris.jobke@gmail.com> | 2013-09-28 08:52:22 -0700 |
|---|---|---|
| committer | Morris Jobke <morris.jobke@gmail.com> | 2013-09-28 08:52:22 -0700 |
| commit | 1097c3ce6368355c5240af8cc0fb14182a60d2c4 (patch) | |
| tree | ae0490c93997dea8ed8bee3ef0986234f81012fb | |
| parent | cb565a5f60921f3fdf3c42df12951e02a3bb338d (diff) | |
| parent | 24d092c4ba4264deb2b6b57299da2acc2971cedc (diff) | |
| download | nextcloud-server-1097c3ce6368355c5240af8cc0fb14182a60d2c4.tar.gz nextcloud-server-1097c3ce6368355c5240af8cc0fb14182a60d2c4.zip | |
Merge pull request #5030 from owncloud/base_defaultavatar_text_on_displayname
Base defaultavatar text on displayname
| -rw-r--r-- | core/avatar/controller.php | 2 | ||||
| -rw-r--r-- | core/js/jquery.avatar.js | 6 | ||||
| -rw-r--r-- | settings/js/personal.js | 1 |
3 files changed, 7 insertions, 2 deletions
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('<img src="'+url+'#'+Math.floor(Math.random()*1000)+'">'); diff --git a/settings/js/personal.js b/settings/js/personal.js index eaaca32f5d8..a923b475731 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); |