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

Jump to bottom

[FIX] Sort by real name if use real name setting is enabled #6758

Merged
merged 2 commits into from
Apr 24, 2017
Merged

[FIX] Sort by real name if use real name setting is enabled #6758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de60c51
Sort direct messages by name if real name setting enabled
alexbrazier Apr 21, 2017
84acd1f
Sort members list by name if real name setting enabled
alexbrazier Apr 21, 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
6 changes: 5 additions & 1 deletion packages/rocketchat-ui-flextab/client/tabs/membersList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,11 @@ Template.membersList.helpers({
};
});

users = _.sortBy(users, u => u.user.username);
if (RocketChat.settings.get('UI_Use_Real_Name')) {
users = _.sortBy(users, u => u.user.name);
} else {
users = _.sortBy(users, u => u.user.username);
}
// show online users first.
// sortBy is stable, so we can do this
users = _.sortBy(users, u => u.status == null);
Expand Down
8 changes: 7 additions & 1 deletion packages/rocketchat-ui-sidenav/client/directMessages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Template.directMessages.helpers({

rooms() {
const query = { t: { $in: ['d']}, f: { $ne: true }, open: true };
const sort = { 't': 1 };

if (Meteor.user() && Meteor.user().settings && Meteor.user().settings.preferences && Meteor.user().settings.preferences.unreadRoomsMode) {
query.$or = [
Expand All @@ -15,6 +16,11 @@ Template.directMessages.helpers({
];
}

return ChatSubscription.find(query, { sort: { 't': 1, 'name': 1 }});
if (RocketChat.settings.get('UI_Use_Real_Name')) {
sort.fname = 1;
}
sort.name = 1;

return ChatSubscription.find(query, { sort });
}
});