Skip to content
Snippets Groups Projects
Commit 66597981 authored by Björn Schießle's avatar Björn Schießle
Browse files

only change display name if the display name from the current user was...

only change display name if the display name from the current user was changed; add correct display name to new user
parent d19de496
No related branches found
No related tags found
No related merge requests found
......@@ -283,7 +283,9 @@ class OC_User {
$displayName = self::determineDisplayName($uid);
$result = true;
}
$_SESSION['display_name'] = $displayName;
if (OC_User::getUser() === $uid) {
$_SESSION['display_name'] = $displayName;
}
return $result;
}
......
......@@ -70,7 +70,9 @@ var UserList = {
add:function (username, groups, subadmin, quota, sort) {
var tr = $('tbody tr').first().clone();
tr.attr('data-uid', username);
tr.attr('data-displayName', username);
tr.find('td.name').text(username);
tr.find('td.displayName').text(username);
var groupsSelect = $('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="' + t('settings', 'Groups') + '"></select>').attr('data-username', username).attr('data-user-groups', groups);
tr.find('td.groups').empty();
if (tr.find('td.subadmins').length > 0) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment