IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1785 from mattermost/plt-1492

Browse Source 
PLT-1492 Fix default for teammate name display setting
This commit is contained in:
Corey Hulen
2016-01-04 08:34:23 -06:00
parent 4a80238487 c81814ee1e
commit 8b9f9fb9c1
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
web/react/components/user_settings/user_settings_display.jsx
View File

@@ -141,6 +141,9 @@ export default class UserSettingsDisplay extends React.Component {
);
}
const showUsername = 'Show username (team default)';
const showNickname = 'Show nickname if one exists, otherwise show first and last name';
const showFullName = 'Show first and last name';
if (this.props.activeSection === 'name_format') {
const nameFormat = [false, false, false];
if (this.state.nameFormat === 'nickname_full_name') {
@@ -157,10 +160,10 @@ export default class UserSettingsDisplay extends React.Component {
<label>
<input
type='radio'
checked={nameFormat[0]}
onChange={this.handleNameRadio.bind(this, 'nickname_full_name')}
checked={nameFormat[1]}
onChange={this.handleNameRadio.bind(this, 'username')}
/>
{'Show nickname if one exists, otherwise show first and last name (team default)'}
{showUsername}
</label>
<br/>
</div>
@@ -168,10 +171,10 @@ export default class UserSettingsDisplay extends React.Component {
<label>
<input
type='radio'
checked={nameFormat[1]}
onChange={this.handleNameRadio.bind(this, 'username')}
checked={nameFormat[0]}
onChange={this.handleNameRadio.bind(this, 'nickname_full_name')}
/>
{'Show username'}
{showNickname}
</label>
<br/>
</div>
@@ -182,11 +185,11 @@ export default class UserSettingsDisplay extends React.Component {
checked={nameFormat[2]}
onChange={this.handleNameRadio.bind(this, 'full_name')}
/>
{'Show first and last name'}
{showFullName}
</label>
<br/>
</div>
<div><br/>{'Set what name to display in the Direct Messages list.'}</div>
<div><br/>{'Set how to display other user\'s names in posts and the Direct Messages list.'}</div>
</div>
];
@@ -205,11 +208,11 @@ export default class UserSettingsDisplay extends React.Component {
} else {
let describe = '';
if (this.state.nameFormat === 'username') {
describe = 'Show username';
describe = showUsername;
} else if (this.state.nameFormat === 'full_name') {
describe = 'Show first and last name';
describe = showFullName;
} else {
describe = 'Show nickname if one exists, otherwise show first and last name (team default)';
describe = showNickname;
}
nameFormatSection = (