diff options
| author | Corey Hulen <corey@hulen.com> | 2015-07-17 14:01:01 -0800 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2015-07-17 14:01:01 -0800 |
| commit | b306ec84378b36372b5465c09233094314789bf2 (patch) | |
| tree | 1995d12ac34a4c6ba459884c84cb28b62d62b296 /web/react/components/channel_header.jsx | |
| parent | 66c22d342fa42068382c9e80427ea953676357db (diff) | |
| parent | 1dba330146a10718a2fc9eac0ae7d6e1d6bc0d79 (diff) | |
| download | chat-b306ec84378b36372b5465c09233094314789bf2.tar.gz chat-b306ec84378b36372b5465c09233094314789bf2.tar.bz2 chat-b306ec84378b36372b5465c09233094314789bf2.zip | |
Merge pull request #177 from hmhealey/mm825
MM-825 Replace FullName field with separate FirstName and LastName fields and repurpose the existing FullName as Nickname
Diffstat (limited to 'web/react/components/channel_header.jsx')
| -rw-r--r-- | web/react/components/channel_header.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx index 2e430489f..30435dc08 100644 --- a/web/react/components/channel_header.jsx +++ b/web/react/components/channel_header.jsx @@ -153,7 +153,7 @@ module.exports = React.createClass({ if (isDirect) { if (this.state.users.length > 1) { var contact = this.state.users[((this.state.users[0].id === currentId) ? 1 : 0)]; - channelTitle = <UserProfile userId={contact.id} overwriteName={contact.full_name || contact.username} />; + channelTitle = <UserProfile userId={contact.id} overwriteName={contact.nickname || contact.username} />; } } |