From ba594bfdecc73ba620445ce4ed30cc55c54f5ce3 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 30 Jul 2019 13:52:43 +0300 Subject: [PATCH] Deprecate user firstname and lastname --- apps/common/main/lib/util/utils.js | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/apps/common/main/lib/util/utils.js b/apps/common/main/lib/util/utils.js index b6c6a353b..fe3601e45 100644 --- a/apps/common/main/lib/util/utils.js +++ b/apps/common/main/lib/util/utils.js @@ -688,16 +688,7 @@ Common.Utils.applyCustomizationPlugins = function(plugins) { Common.Utils.fillUserInfo = function(info, lang, defname) { var _user = info || {}; !_user.id && (_user.id = ('uid-' + Date.now())); - if (_.isEmpty(_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; + _user.fullname = _.isEmpty(_user.name) ? defname : _user.name; return _user; };