diff options
Diffstat (limited to 'webapp/components/admin_console')
3 files changed, 26 insertions, 9 deletions
diff --git a/webapp/components/admin_console/admin_sidebar.jsx b/webapp/components/admin_console/admin_sidebar.jsx index 2b304f11d..e8303ea0c 100644 --- a/webapp/components/admin_console/admin_sidebar.jsx +++ b/webapp/components/admin_console/admin_sidebar.jsx @@ -114,6 +114,19 @@ export default class AdminSidebar extends React.Component { document.title = Utils.localizeMessage('sidebar_right_menu.console', 'System Console') + ' - ' + currentSiteName; } + sortTeams(a, b) { + const teamA = a.display_name.toLowerCase(); + const teamB = b.display_name.toLowerCase(); + + if (teamA < teamB) { + return -1; + } + if (teamA > teamB) { + return 1; + } + return 0; + } + renderAddTeamButton() { const addTeamTooltip = ( <Tooltip id='add-team-tooltip'> @@ -146,18 +159,18 @@ export default class AdminSidebar extends React.Component { renderTeams() { const teams = []; + const teamsArray = []; - for (const key in this.state.selectedTeams) { - if (!this.state.selectedTeams.hasOwnProperty(key)) { - continue; + Reflect.ownKeys(this.state.selectedTeams).forEach((key) => { + if (this.state.teams[key]) { + teamsArray.push(this.state.teams[key]); } + }); - const team = this.state.teams[key]; - - if (!team) { - continue; - } + teamsArray.sort(this.sortTeams); + for (let i = 0; i < teamsArray.length; i++) { + const team = teamsArray[i]; teams.push( <AdminSidebarTeam key={team.id} diff --git a/webapp/components/admin_console/admin_team_members_dropdown.jsx b/webapp/components/admin_console/admin_team_members_dropdown.jsx index 028effe66..253259493 100644 --- a/webapp/components/admin_console/admin_team_members_dropdown.jsx +++ b/webapp/components/admin_console/admin_team_members_dropdown.jsx @@ -464,7 +464,10 @@ export default class AdminTeamMembersDropdown extends React.Component { <br/> <FormattedMessage id='admin.user_item.confirmDemotionCmd' - defaultMessage='platform -assign_role -team_name="yourteam" -email="name@yourcompany.com" -role="system_admin"' + defaultMessage='platform roles system_admin {username}' + values={{ + username: me.username + }} /> {serverError} </div> diff --git a/webapp/components/admin_console/select_team_modal.jsx b/webapp/components/admin_console/select_team_modal.jsx index a661dd2f0..e407e61b4 100644 --- a/webapp/components/admin_console/select_team_modal.jsx +++ b/webapp/components/admin_console/select_team_modal.jsx @@ -24,6 +24,7 @@ export default class SelectTeamModal extends React.Component { doCancel() { this.props.onModalDismissed(); } + compare(a, b) { const teamA = a.display_name.toLowerCase(); const teamB = b.display_name.toLowerCase(); |