Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Deprecate user firstname and lastname

Browse source
This commit is contained in:
Julia Radzhabova 2019-07-30 13:52:43 +03:00
parent 4b16460ed0
commit ba594bfdec
1 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/common/main/lib/util/utils.js
View file

@ -688,16 +688,7 @@ Common.Utils.applyCustomizationPlugins = function(plugins) {
Common.Utils.fillUserInfo = function(info, lang, defname) { Common.Utils.fillUserInfo = function(info, lang, defname) {
var _user = info || {}; var _user = info || {};
!_user.id && (_user.id = ('uid-' + Date.now())); !_user.id && (_user.id = ('uid-' + Date.now()));
if (_.isEmpty(_user.name)) { _user.fullname = _.isEmpty(_user.name) ? defname : _user.name;
_.isEmpty(_user.firstname) && _.isEmpty(_user.lastname) && (_user.firstname = defname);
if (_.isEmpty(_user.firstname))
_user.fullname = _user.lastname;
else if (_.isEmpty(_user.lastname))
_user.fullname = _user.firstname;
else
_user.fullname = /^ru/.test(lang) ? _user.lastname + ' ' + _user.firstname : _user.firstname + ' ' + _user.lastname;
} else
_user.fullname = _user.name;
return _user; return _user;
}; };