Skip to content

Commit

Permalink
[FIX] Livechat sidebar using "Unread on Top" user preference (#10734)
Browse files Browse the repository at this point in the history
[FIX] User's preference `Unread on Top` wasn't working for LiveChat rooms
  • Loading branch information
renatobecker authored and rodrigok committed May 21, 2018
1 parent 8b87585 commit 4ed57e0
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 2 deletions.
4 changes: 2 additions & 2 deletions packages/rocketchat-livechat/client/views/sideNav/livechat.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 };
}

Expand Down
41 changes: 41 additions & 0 deletions server/startup/migrations/v120.js
Original file line number Diff line number Diff line change
@@ -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
}
});
}
});

0 comments on commit 4ed57e0

Please sign in to comment.