diff options
author | Saturnino Abril <saturnino.abril@gmail.com> | 2017-02-01 08:57:16 +0900 |
---|---|---|
committer | enahum <nahumhbl@gmail.com> | 2017-01-31 20:57:16 -0300 |
commit | 9ba968ce3354b1a8ab307ecc4cc785bdee16f914 (patch) | |
tree | 1180a7913c326ed66191555d5a21d0643e932b8a /webapp/components/admin_console/admin_navbar_dropdown.jsx | |
parent | 9369cab56c82629d505d44d572f273df1d396972 (diff) | |
download | chat-9ba968ce3354b1a8ab307ecc4cc785bdee16f914.tar.gz chat-9ba968ce3354b1a8ab307ecc4cc785bdee16f914.tar.bz2 chat-9ba968ce3354b1a8ab307ecc4cc785bdee16f914.zip |
Use consistent Display Name sorting code throughout the webapp #5159 (#5213)
* Use consistent Display Name sorting code throughout the webapp #5159
* fixed broken sorting of teams and channels
Diffstat (limited to 'webapp/components/admin_console/admin_navbar_dropdown.jsx')
-rw-r--r-- | webapp/components/admin_console/admin_navbar_dropdown.jsx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/webapp/components/admin_console/admin_navbar_dropdown.jsx b/webapp/components/admin_console/admin_navbar_dropdown.jsx index d4e144c4f..a1ec2885b 100644 --- a/webapp/components/admin_console/admin_navbar_dropdown.jsx +++ b/webapp/components/admin_console/admin_navbar_dropdown.jsx @@ -6,6 +6,7 @@ import ReactDOM from 'react-dom'; import TeamStore from 'stores/team_store.jsx'; import Constants from 'utils/constants.jsx'; +import {sortTeamsByDisplayName} from 'utils/utils.jsx'; import * as GlobalActions from 'actions/global_actions.jsx'; import {FormattedMessage} from 'react-intl'; @@ -64,9 +65,7 @@ export default class AdminNavbarDropdown extends React.Component { } // Sort teams alphabetically with display_name - teamsArray.sort((teamA, teamB) => - teamA.display_name.localeCompare(teamB.display_name) - ); + teamsArray = teamsArray.sort(sortTeamsByDisplayName); for (const team of teamsArray) { teams.push( |