diff options
| author | hmhealey <harrisonmhealey@gmail.com> | 2016-03-01 16:28:47 -0500 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2016-03-03 08:46:56 -0500 |
| commit | 26ea30cb162684990cacdfd17aeb6bfcc5e10e03 (patch) | |
| tree | 1b5939b91813526bf7e71a13973fe18e54db2af1 /web/react/utils | |
| parent | 998d621155bcbcab4ae12f8f51c2d8d39d2d45c1 (diff) | |
| download | chat-26ea30cb162684990cacdfd17aeb6bfcc5e10e03.tar.gz chat-26ea30cb162684990cacdfd17aeb6bfcc5e10e03.tar.bz2 chat-26ea30cb162684990cacdfd17aeb6bfcc5e10e03.zip | |
Changed information displayed in user list to obey display name settings
Diffstat (limited to 'web/react/utils')
| -rw-r--r-- | web/react/utils/constants.jsx | 2 | ||||
| -rw-r--r-- | web/react/utils/utils.jsx | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx index 88f01a475..daea9f43e 100644 --- a/web/react/utils/constants.jsx +++ b/web/react/utils/constants.jsx @@ -437,6 +437,8 @@ export default { Preferences: { CATEGORY_DIRECT_CHANNEL_SHOW: 'direct_channel_show', CATEGORY_DISPLAY_SETTINGS: 'display_settings', + DISPLAY_PREFER_NICKNAME: 'nickname_full_name', + DISPLAY_PREFER_FULL_NAME: 'full_name', CATEGORY_ADVANCED_SETTINGS: 'advanced_settings', TUTORIAL_STEP: 'tutorial_step' }, diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index 3e531c821..6ab2f64d4 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -1082,9 +1082,9 @@ export function displayUsername(userId) { let username = ''; if (user) { - if (nameFormat === 'nickname_full_name') { + if (nameFormat === Constants.Preferences.DISPLAY_PREFER_NICKNAME) { username = user.nickname || getFullName(user); - } else if (nameFormat === 'full_name') { + } else if (nameFormat === Constants.Preferences.DISPLAY_PREFER_FULL_NAME) { username = getFullName(user); } if (!username.trim().length) { |