summaryrefslogtreecommitdiffstats
path: root/webapp/components/admin_console
diff options
context:
space:
mode:
authorenahum <nahumhbl@gmail.com>2016-12-19 10:05:46 -0300
committerJoram Wilander <jwawilander@gmail.com>2016-12-19 08:05:46 -0500
commit999d1553e1ce45adf58f6082b160bc1147dc592b (patch)
tree369a9b7f46dd44d136a79a050469429169433cec /webapp/components/admin_console
parent3ce2ce9dc882ed962dc3ce7550bdb07963f376b6 (diff)
downloadchat-999d1553e1ce45adf58f6082b160bc1147dc592b.tar.gz
chat-999d1553e1ce45adf58f6082b160bc1147dc592b.tar.bz2
chat-999d1553e1ce45adf58f6082b160bc1147dc592b.zip
PLT-4167 Team Sidebar (#4569)
* PLT-4167 Team Sidebar * Address feedback from PM * change route from my_members to members * bug fixes * Updating styles for teams sidebar (#4681) * Added PM changes * Fix corner cases * Addressing feedback * use two different endpoints * Bug fixes * Rename model and client functions, using preferences to store last team and channel viewed * Fix mobile notification count and closing the team sidebar * unit test, fixed bad merge and retrieve from cached when available * bug fixes * use id for last channel in preferences, query optimization * Updating multi team css (#4830)
Diffstat (limited to 'webapp/components/admin_console')
-rw-r--r--webapp/components/admin_console/admin_navbar_dropdown.jsx35
1 files changed, 20 insertions, 15 deletions
diff --git a/webapp/components/admin_console/admin_navbar_dropdown.jsx b/webapp/components/admin_console/admin_navbar_dropdown.jsx
index f20451b4b..5b65868e9 100644
--- a/webapp/components/admin_console/admin_navbar_dropdown.jsx
+++ b/webapp/components/admin_console/admin_navbar_dropdown.jsx
@@ -50,13 +50,14 @@ export default class AdminNavbarDropdown extends React.Component {
}
render() {
- var teams = [];
+ const teams = [];
+ let switchTeams;
if (this.state.teamMembers && this.state.teamMembers.length > 0) {
- for (var index in this.state.teamMembers) {
+ for (const index in this.state.teamMembers) {
if (this.state.teamMembers.hasOwnProperty(index)) {
- var teamMember = this.state.teamMembers[index];
- var team = this.state.teams[teamMember.team_id];
+ const teamMember = this.state.teamMembers[index];
+ const team = this.state.teams[teamMember.team_id];
teams.push(
<li key={'team_' + team.name}>
<Link
@@ -79,6 +80,20 @@ export default class AdminNavbarDropdown extends React.Component {
className='divider'
/>
);
+ } else {
+ switchTeams = (
+ <li>
+ <Link
+ to={'/select_team'}
+ >
+ <i className='fa fa-exchange'/>
+ <FormattedMessage
+ id='admin.nav.switch'
+ defaultMessage='Team Selection'
+ />
+ </Link>
+ </li>
+ );
}
return (
@@ -104,17 +119,7 @@ export default class AdminNavbarDropdown extends React.Component {
role='menu'
>
{teams}
- <li>
- <Link
- to={'/select_team'}
- >
- <i className='fa fa-exchange'/>
- <FormattedMessage
- id='admin.nav.switch'
- defaultMessage='Team Selection'
- />
- </Link>
- </li>
+ {switchTeams}
<li
key='teamDiv'
className='divider'