Enabled name display settings in more places
Этот коммит содержится в:
@@ -137,6 +137,7 @@ export default {
|
||||
],
|
||||
MONTHS: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'],
|
||||
MAX_DMS: 20,
|
||||
MAX_CHANNEL_POPOVER_COUNT: 20,
|
||||
DM_CHANNEL: 'D',
|
||||
OPEN_CHANNEL: 'O',
|
||||
PRIVATE_CHANNEL: 'P',
|
||||
|
||||
@@ -981,13 +981,15 @@ export function displayUsername(userId) {
|
||||
const nameFormat = PreferenceStore.getPreference(Constants.Preferences.CATEGORY_DISPLAY_SETTINGS, 'name_format', {value: 'false'}).value;
|
||||
|
||||
let username = '';
|
||||
if (nameFormat === 'nickname_full_name') {
|
||||
username = user.nickname || getFullName(user);
|
||||
} else if (nameFormat === 'full_name') {
|
||||
username = getFullName(user);
|
||||
}
|
||||
if (!username.trim().length) {
|
||||
username = user.username;
|
||||
if (user) {
|
||||
if (nameFormat === 'nickname_full_name') {
|
||||
username = user.nickname || getFullName(user);
|
||||
} else if (nameFormat === 'full_name') {
|
||||
username = getFullName(user);
|
||||
}
|
||||
if (!username.trim().length) {
|
||||
username = user.username;
|
||||
}
|
||||
}
|
||||
|
||||
return username;
|
||||
|
||||
Ссылка в новой задаче
Block a user