diff options
author | Nicu Tofan <nicu.tofan@gmail.com> | 2018-06-28 17:00:35 +0300 |
---|---|---|
committer | Nicu Tofan <nicu.tofan@gmail.com> | 2018-06-28 17:00:35 +0300 |
commit | 3eba6ef2856946925795f9cd370583be892344dd (patch) | |
tree | 11d3bb19678153f955647fbf4b3f6d2299933d7d /models | |
parent | b7d508e8c4cf858559e144053d119ceaebfa9697 (diff) | |
parent | ad54a8a48404a84b0bf5ff7dab5348be6dda574e (diff) | |
download | wekan-3eba6ef2856946925795f9cd370583be892344dd.tar.gz wekan-3eba6ef2856946925795f9cd370583be892344dd.tar.bz2 wekan-3eba6ef2856946925795f9cd370583be892344dd.zip |
Merge branch 'devel' into nested-tasks
Diffstat (limited to 'models')
-rw-r--r-- | models/boards.js | 27 | ||||
-rw-r--r-- | models/users.js | 5 |
2 files changed, 32 insertions, 0 deletions
diff --git a/models/boards.js b/models/boards.js index c83050c0..76a8f704 100644 --- a/models/boards.js +++ b/models/boards.js @@ -369,6 +369,33 @@ Boards.helpers({ } return result; }, + + cardsInInterval(start, end) { + return Cards.find({ + $or: [ + { + startAt: { + $lte: start, + }, endAt: { + $gte: start, + }, + }, { + startAt: { + $lte: end, + }, endAt: { + $gte: end, + }, + }, { + startAt: { + $gte: start, + }, endAt: { + $lte: end, + }, + }, + ], + }); + }, + }); diff --git a/models/users.js b/models/users.js index 0093f7cb..5a7fbbe5 100644 --- a/models/users.js +++ b/models/users.js @@ -100,6 +100,11 @@ Users.attachSchema(new SimpleSchema({ 'profile.boardView': { type: String, optional: true, + allowedValues: [ + 'board-view-lists', + 'board-view-swimlanes', + 'board-view-cal', + ], }, services: { type: Object, |