From 9ba968ce3354b1a8ab307ecc4cc785bdee16f914 Mon Sep 17 00:00:00 2001 From: Saturnino Abril Date: Wed, 1 Feb 2017 08:57:16 +0900 Subject: 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 --- webapp/stores/channel_store.jsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'webapp/stores') diff --git a/webapp/stores/channel_store.jsx b/webapp/stores/channel_store.jsx index 30f395cc3..575f68f4c 100644 --- a/webapp/stores/channel_store.jsx +++ b/webapp/stores/channel_store.jsx @@ -204,10 +204,10 @@ class ChannelStoreClass extends EventEmitter { } if (!Utils) { - Utils = require('utils/utils.jsx'); //eslint-disable-line global-require + Utils = require('utils/channel_utils.jsx'); //eslint-disable-line global-require } - channels.sort(Utils.sortByDisplayName); + channels = channels.sort(Utils.sortChannelsByDisplayName); this.storeChannels(channels); } @@ -286,10 +286,10 @@ class ChannelStoreClass extends EventEmitter { const teamChannels = this.moreChannels[teamId] || {}; if (!Utils) { - Utils = require('utils/utils.jsx'); //eslint-disable-line global-require + Utils = require('utils/channel_utils.jsx'); //eslint-disable-line global-require } - return Object.keys(teamChannels).map((cid) => teamChannels[cid]).sort(Utils.sortByDisplayName); + return Object.keys(teamChannels).map((cid) => teamChannels[cid]).sort(Utils.sortChannelsByDisplayName); } storeStats(stats) { -- cgit v1.2.3-1-g7c22