diff --git a/packages/rocketchat-livechat/client/views/sideNav/livechat.js b/packages/rocketchat-livechat/client/views/sideNav/livechat.js index 659850b88319..a62542e5b9fc 100644 --- a/packages/rocketchat-livechat/client/views/sideNav/livechat.js +++ b/packages/rocketchat-livechat/client/views/sideNav/livechat.js @@ -22,10 +22,10 @@ Template.livechat.helpers({ }; const user = RocketChat.models.Users.findOne(Meteor.userId(), { - fields: { 'settings.preferences.roomsListExhibitionMode': 1 } + fields: { 'settings.preferences.sidebarShowUnread': 1 } }); - if (RocketChat.getUserPreference(user, 'roomsListExhibitionMode') === 'unread') { + if (RocketChat.getUserPreference(user, 'sidebarShowUnread')) { query.alert = { $ne: true }; } diff --git a/server/startup/migrations/v120.js b/server/startup/migrations/v120.js new file mode 100644 index 000000000000..b8a2dae63158 --- /dev/null +++ b/server/startup/migrations/v120.js @@ -0,0 +1,41 @@ +RocketChat.Migrations.add({ + version: 120, + up() { + RocketChat.models.Users.update({ + 'settings.preferences.roomsListExhibitionMode': 'activity' + }, { + $unset: { + 'settings.preferences.roomsListExhibitionMode': 1 + }, + $set: { + 'settings.preferences.sidebarSortby': 'activity', + 'settings.preferences.sidebarShowFavorites': true + } + }); + + RocketChat.models.Users.update({ + 'settings.preferences.roomsListExhibitionMode': 'unread' + }, { + $unset: { + 'settings.preferences.roomsListExhibitionMode': 1 + }, + $set: { + 'settings.preferences.sidebarSortby': 'alphabetical', + 'settings.preferences.sidebarShowUnread' : true, + 'settings.preferences.sidebarShowFavorites': true + } + }); + + RocketChat.models.Users.update({ + 'settings.preferences.roomsListExhibitionMode': 'category' + }, { + $unset: { + 'settings.preferences.roomsListExhibitionMode': 1 + }, + $set: { + 'settings.preferences.sidebarSortby': 'alphabetical', + 'settings.preferences.sidebarShowFavorites': true + } + }); + } +});