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

Fix title in RHS for pinned posts (#5976)

Browse Source
This commit is contained in:
Joram Wilander
2017-04-04 15:20:55 -04:00
committed by Christopher Speller
parent 97de1d0982
commit 3e6372b3d4
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
webapp/components/sidebar_right.jsx
View File

@@ -196,6 +196,17 @@ export default class SidebarRight extends React.Component {
searchForm = <SearchBox isFocus={this.state.searchVisible && Utils.isMobile()}/>;
}
const channel = this.props.channel;
let channelDisplayName = '';
if (channel) {
if (channel.type === Constants.DM_CHANNEL || channel.type === Constants.GM_CHANNEL) {
channelDisplayName = Utils.localizeMessage('rhs_root.direct', 'Direct Message');
} else {
channelDisplayName = channel.display_name;
}
}
if (this.state.searchVisible) {
content = (
<div className='sidebar--right__content'>
@@ -207,7 +218,7 @@ export default class SidebarRight extends React.Component {
useMilitaryTime={this.state.useMilitaryTime}
toggleSize={this.toggleSize}
shrink={this.onShrink}
channelDisplayName={this.props.channel ? this.props.channel.display_name : ''}
channelDisplayName={channelDisplayName}
/>
</div>
);