summaryrefslogtreecommitdiffstats
path: root/web/react/components/sidebar.jsx
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-10-05 10:20:14 -0400
committerChristopher Speller <crspeller@gmail.com>2015-10-05 10:20:14 -0400
commitf4afabd67999baabd06038cb6f3d664f2ebf77ba (patch)
treef839f71e9c072569fa119dd5a133daa955012f1b /web/react/components/sidebar.jsx
parent8595fd85c7b64e0e7f928abd398f1e0f5d62eea8 (diff)
parent3b34e7313251c5c9b7dde8c5916f83ab9e9f2a31 (diff)
downloadchat-f4afabd67999baabd06038cb6f3d664f2ebf77ba.tar.gz
chat-f4afabd67999baabd06038cb6f3d664f2ebf77ba.tar.bz2
chat-f4afabd67999baabd06038cb6f3d664f2ebf77ba.zip
Merge pull request #903 from mattermost/PLT-44
PLT-44 allow team switching without the need to login
Diffstat (limited to 'web/react/components/sidebar.jsx')
-rw-r--r--web/react/components/sidebar.jsx4
1 files changed, 3 insertions, 1 deletions
diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index 6d4b56b7b..c0841a508 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -512,6 +512,7 @@ export default class Sidebar extends React.Component {
/>
<SidebarHeader
teamDisplayName={this.props.teamDisplayName}
+ teamName={this.props.teamName}
teamType={this.props.teamType}
/>
<SearchBox />
@@ -591,5 +592,6 @@ Sidebar.defaultProps = {
};
Sidebar.propTypes = {
teamType: React.PropTypes.string,
- teamDisplayName: React.PropTypes.string
+ teamDisplayName: React.PropTypes.string,
+ teamName: React.PropTypes.string
};