diff --git a/client/src/models/Board.js b/client/src/models/Board.js index 8e9fef2d..bd8525e3 100755 --- a/client/src/models/Board.js +++ b/client/src/models/Board.js @@ -219,7 +219,12 @@ export default class extends BaseModel { } getOrderedMembershipsQuerySet() { - return this.memberships.orderBy('createdAt'); + return this.memberships.orderBy((membership) => + this.memberUsers + .toModelArray() + .filter((user) => user.id === membership.userId)[0] + .name.toLocaleLowerCase(), + ); } getOrderedLabelsQuerySet() { diff --git a/client/src/models/User.js b/client/src/models/User.js index b2e99ccc..3fa40140 100755 --- a/client/src/models/User.js +++ b/client/src/models/User.js @@ -298,7 +298,7 @@ export default class extends BaseModel { static getOrderedUndeletedQuerySet() { return this.filter({ deletedAt: null, - }).orderBy('createdAt'); + }).orderBy((u) => u.name.toLocaleLowerCase()); } getOrderedProjectManagersQuerySet() {