Add missing files with name changes

pull/3851/head
Alex Brazier 9 years ago
parent 404f758853
commit 253f99352e
  1. 2
      packages/rocketchat-cas/cas_server.js
  2. 5
      packages/rocketchat-crowd/server/crowd.js
  3. 6
      packages/rocketchat-ldap/server/sync.js
  4. 8
      packages/rocketchat-lib/server/functions/saveUser.js
  5. 5
      packages/rocketchat-livechat/server/lib/Livechat.js
  6. 3
      packages/rocketchat-theme/client/imports/base.less

@ -188,7 +188,7 @@ Accounts.registerLoginHandler(function(options) {
logger.debug('Syncing user attributes');
// Update name
if (int_attrs.name) {
Meteor.users.update(user, { $set: { name: int_attrs.name }});
RocketChat._setRealName(user._id, int_attrs.name);
}
// Update email

@ -85,7 +85,6 @@ const CROWD = class CROWD {
syncDataToUser(crowdUser, id) {
const user = {
name: crowdUser.displayname,
username: crowdUser.username,
emails: [{
address : crowdUser.email,
@ -95,6 +94,10 @@ const CROWD = class CROWD {
active: crowdUser.active
};
if (crowdUser.displayname) {
RocketChat._setRealName(user._id, crowdUser.displayname);
}
Meteor.users.update(id, {
$set: user
});

@ -122,9 +122,13 @@ syncUserData = function syncUserData(user, ldapUser) {
const userData = getDataToSyncUserData(ldapUser, user);
if (user && user._id && userData) {
logger.debug('setting', JSON.stringify(userData, null, 2));
if (userData.name) {
RocketChat._setRealName(user._id, userData.name);
delete userData.name;
}
Meteor.users.update(user._id, { $set: userData });
user = Meteor.users.findOne({_id: user._id});
logger.debug('setting', JSON.stringify(userData, null, 2));
}
if (RocketChat.settings.get('LDAP_Username_Field') !== '') {

@ -139,6 +139,10 @@ RocketChat.saveUser = function(userId, userData) {
RocketChat.setUsername(userData._id, userData.username);
}
if (userData.name) {
RocketChat.setRealName(userData._id, userData.name);
}
if (userData.email) {
RocketChat.setEmail(userData._id, userData.email);
}
@ -151,10 +155,6 @@ RocketChat.saveUser = function(userId, userData) {
$set: {}
};
if (userData.name) {
updateUser.$set.name = userData.name;
}
if (userData.roles) {
updateUser.$set.roles = userData.roles;
}

@ -116,7 +116,6 @@ RocketChat.Livechat = {
userId = existingUser._id;
} else {
updateUser.$set.name = name;
var userData = {
username: username,
@ -156,6 +155,10 @@ RocketChat.Livechat = {
];
}
if (name) {
RocketChat._setRealName(userId, name);
}
Meteor.users.update(userId, updateUser);
return userId;

@ -2499,8 +2499,9 @@ label.required::after {
display: inline-block;
}
}
.secondary-name {
color: #666;
color: #666666;
font-size: 15px;
}
}

Loading…
Cancel
Save