diff options
author | Joram Wilander <jwawilander@gmail.com> | 2015-10-16 07:57:38 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2015-10-16 07:57:38 -0400 |
commit | 7718783d0c57d46db00123379d3b8f9818bb791b (patch) | |
tree | e8e2ec79550727f80c5ba21ae82bd8d36587e362 /web | |
parent | 92e986945cccf4f586c59e6c418cb240f6864a4b (diff) | |
parent | 7abde676a1828714c71b25184fdd91a81c2d77a1 (diff) | |
download | chat-7718783d0c57d46db00123379d3b8f9818bb791b.tar.gz chat-7718783d0c57d46db00123379d3b8f9818bb791b.tar.bz2 chat-7718783d0c57d46db00123379d3b8f9818bb791b.zip |
Merge pull request #1049 from apaatsio/full-teams-data
Use display name instead of name in team switcher menu
Diffstat (limited to 'web')
-rw-r--r-- | web/react/components/navbar_dropdown.jsx | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/web/react/components/navbar_dropdown.jsx b/web/react/components/navbar_dropdown.jsx index e0410800f..1cb13bbe5 100644 --- a/web/react/components/navbar_dropdown.jsx +++ b/web/react/components/navbar_dropdown.jsx @@ -11,7 +11,24 @@ var AboutBuildModal = require('./about_build_modal.jsx'); var Constants = require('../utils/constants.jsx'); function getStateFromStores() { - return {teams: UserStore.getTeams()}; + let teams = []; + let teamsObject = UserStore.getTeams(); + for (let teamId in teamsObject) { + if (teamsObject.hasOwnProperty(teamId)) { + teams.push(teamsObject[teamId]); + } + } + teams.sort(function sortByDisplayName(teamA, teamB) { + let teamADisplayName = teamA.display_name.toLowerCase(); + let teamBDisplayName = teamB.display_name.toLowerCase(); + if (teamADisplayName < teamBDisplayName) { + return -1; + } else if (teamADisplayName > teamBDisplayName) { + return 1; + } + return 0; + }); + return {teams}; } export default class NavbarDropdown extends React.Component { @@ -154,9 +171,9 @@ export default class NavbarDropdown extends React.Component { </li> ); - this.state.teams.forEach((teamName) => { - if (teamName !== this.props.teamName) { - teams.push(<li key={teamName}><a href={Utils.getWindowLocationOrigin() + '/' + teamName}>{'Switch to ' + teamName}</a></li>); + this.state.teams.forEach((team) => { + if (team.name !== this.props.teamName) { + teams.push(<li key={team.name}><a href={Utils.getWindowLocationOrigin() + '/' + team.name}>{'Switch to ' + team.display_name}</a></li>); } }); } |