Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] Sort direct messages by full name if show real names setting enabled #8717

Merged
merged 2 commits into from
Nov 7, 2017
Merged

[FIX] Sort direct messages by full name if show real names setting enabled #8717

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
451613c
Restore sorting direct messages by full name if setting enabled
alexbrazier Oct 30, 2017
effdb49
Merge branch 'develop' into bugfix/direct-message-sort
rodrigok Nov 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion packages/rocketchat-ui-sidenav/client/roomList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,12 @@ Template.roomList.helpers({
const query = {
open: true
};
const sort = { 't': 1, 'name': 1 };
const sort = { 't': 1 };
if (this.identifier === 'd' && RocketChat.settings.get('UI_Use_Real_Name')) {
sort.fname = 1;
} else {
sort.name = 1;
}
if (this.identifier === 'f') {
query.f = favoritesEnabled;
} else {
Expand Down