diff options
author | boeserwolf <github@noxware.de> | 2020-04-19 12:30:21 +0300 |
---|---|---|
committer | boeserwolf <github@noxware.de> | 2020-04-19 13:49:07 +0300 |
commit | 10fcc19b7f9307e71f01b6abca055806d69f7d4e (patch) | |
tree | e236eb00f9b72ca67b0113f49d45803eccd55477 /models | |
parent | 9f396e9038712e0223cbd47b7bc14253610f9af9 (diff) | |
download | wekan-10fcc19b7f9307e71f01b6abca055806d69f7d4e.tar.gz wekan-10fcc19b7f9307e71f01b6abca055806d69f7d4e.tar.bz2 wekan-10fcc19b7f9307e71f01b6abca055806d69f7d4e.zip |
Add sortDefault helper for sorting boards
Diffstat (limited to 'models')
-rw-r--r-- | models/boards.js | 9 | ||||
-rw-r--r-- | models/users.js | 30 |
2 files changed, 30 insertions, 9 deletions
diff --git a/models/boards.js b/models/boards.js index fba690a7..fdb07f89 100644 --- a/models/boards.js +++ b/models/boards.js @@ -1474,7 +1474,7 @@ if (Meteor.isServer) { 'members.userId': paramUserId, }, { - sort: ['title'], + sort: { sort: 1 /* boards default sorting */ }, }, ).map(function(board) { return { @@ -1504,7 +1504,12 @@ if (Meteor.isServer) { Authentication.checkUserId(req.userId); JsonRoutes.sendResult(res, { code: 200, - data: Boards.find({ permission: 'public' }).map(function(doc) { + data: Boards.find( + { permission: 'public' }, + { + sort: { sort: 1 /* boards default sorting */ }, + }, + ).map(function(doc) { return { _id: doc._id, title: doc.title, diff --git a/models/users.js b/models/users.js index a9eeb38b..f4b7329a 100644 --- a/models/users.js +++ b/models/users.js @@ -386,12 +386,20 @@ if (Meteor.isClient) { Users.helpers({ boards() { - return Boards.find({ 'members.userId': this._id }); + return Boards.find( + { 'members.userId': this._id }, + { sort: { sort: 1 /* boards default sorting */ } }, + ); }, starredBoards() { const { starredBoards = [] } = this.profile || {}; - return Boards.find({ archived: false, _id: { $in: starredBoards } }); + return Boards.find( + { archived: false, _id: { $in: starredBoards } }, + { + sort: { sort: 1 /* boards default sorting */ }, + }, + ); }, hasStarred(boardId) { @@ -401,7 +409,12 @@ Users.helpers({ invitedBoards() { const { invitedBoards = [] } = this.profile || {}; - return Boards.find({ archived: false, _id: { $in: invitedBoards } }); + return Boards.find( + { archived: false, _id: { $in: invitedBoards } }, + { + sort: { sort: 1 /* boards default sorting */ }, + }, + ); }, isInvitedTo(boardId) { @@ -1292,10 +1305,13 @@ if (Meteor.isServer) { let data = Meteor.users.findOne({ _id: id }); if (data !== undefined) { if (action === 'takeOwnership') { - data = Boards.find({ - 'members.userId': id, - 'members.isAdmin': true, - }).map(function(board) { + data = Boards.find( + { + 'members.userId': id, + 'members.isAdmin': true, + }, + { sort: { sort: 1 /* boards default sorting */ } }, + ).map(function(board) { if (board.hasMember(req.userId)) { board.removeMember(req.userId); } |