Merge branch 'devel' into nested-tasks

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,