summaryrefslogtreecommitdiffstats
path: root/web/react/components/navbar_dropdown.jsx
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-10-01 17:52:47 -0700
committer=Corey Hulen <corey@hulen.com>2015-10-01 17:52:47 -0700
commit430806301da06e927b8d7d6dcba20ea4b6b6d6c1 (patch)
tree8a457efc7d5570679c3a2ae607b0a52f79cfa981 /web/react/components/navbar_dropdown.jsx
parent013df9f6614fcf8816dc29bc8f07d05a605e47e0 (diff)
downloadchat-430806301da06e927b8d7d6dcba20ea4b6b6d6c1.tar.gz
chat-430806301da06e927b8d7d6dcba20ea4b6b6d6c1.tar.bz2
chat-430806301da06e927b8d7d6dcba20ea4b6b6d6c1.zip
PLT-44 allow team switching without the need to login
Diffstat (limited to 'web/react/components/navbar_dropdown.jsx')
-rw-r--r--web/react/components/navbar_dropdown.jsx10
1 files changed, 6 insertions, 4 deletions
diff --git a/web/react/components/navbar_dropdown.jsx b/web/react/components/navbar_dropdown.jsx
index 57a78a0d4..dc5983f1e 100644
--- a/web/react/components/navbar_dropdown.jsx
+++ b/web/react/components/navbar_dropdown.jsx
@@ -142,10 +142,10 @@ export default class NavbarDropdown extends React.Component {
>
</li>
);
- if (this.state.teams.length > 1 && this.state.currentTeam) {
- var curTeamName = this.state.currentTeam.name;
+
+ if (this.state.teams.length > 1) {
this.state.teams.forEach((teamName) => {
- if (teamName !== curTeamName) {
+ if (teamName !== this.props.teamName) {
teams.push(<li key={teamName}><a href={Utils.getWindowLocationOrigin() + '/' + teamName}>{'Switch to ' + teamName}</a></li>);
}
});
@@ -234,5 +234,7 @@ NavbarDropdown.defaultProps = {
teamType: ''
};
NavbarDropdown.propTypes = {
- teamType: React.PropTypes.string
+ teamType: React.PropTypes.string,
+ teamDisplayName: React.PropTypes.string,
+ teamName: React.PropTypes.string
};