Merge branch 'edge' of github.com:wekan/wekan into edge

2 files changed, 12 insertions, 4 deletions

diff --git a/models/import.js b/models/import.js
index 5cdf8dc1..343e1c24 100644
--- a/models/import.js
+++ b/models/import.js
@@ -3,10 +3,10 @@ import { WekanCreator } from './wekanCreator';
 
 Meteor.methods({
   importBoard(board, data, importSource, currentBoard) {
-    //check(board, Object);
-    //check(data, Object);
-    //check(importSource, String);
-    //check(currentBoard, Match.Maybe(String));
+    check(board, Object);
+    check(data, Object);
+    check(importSource, String);
+    check(currentBoard, Match.Maybe(String));
     let creator;
     switch (importSource) {
     case 'trello':
diff --git a/models/wekanCreator.js b/models/wekanCreator.js
index 2d3ec5de..3a627424 100644
--- a/models/wekanCreator.js
+++ b/models/wekanCreator.js
@@ -298,6 +298,10 @@ export class WekanCreator {
           cardToCreate.members = wekanMembers;
         }
       }
+      // set color
+      if (card.color) {
+        cardToCreate.color = card.color;
+      }
       // insert card
       const cardId = Cards.direct.insert(cardToCreate);
       // keep track of Wekan id => Wekan id
@@ -484,6 +488,10 @@ export class WekanCreator {
         title: swimlane.title,
         sort: swimlane.sort ? swimlane.sort : swimlaneIndex,
       };
+      // set color
+      if (swimlane.color) {
+        swimlaneToCreate.color = swimlane.color;
+      }
       const swimlaneId = Swimlanes.direct.insert(swimlaneToCreate);
       Swimlanes.direct.update(swimlaneId, {
         $set: {