only change display name if the display name from the current user was changed; add correct display name to new user

remotes/origin/stable5
Björn Schießle 12 years ago
parent d19de49606
commit 6659798197
  1. 4
      lib/user.php
  2. 2
      settings/js/users.js

@ -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) {

Loading…
Cancel
Save