diff options
author | Lauri Ojansivu <x@xet7.org> | 2019-03-11 19:37:52 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2019-03-11 19:37:52 +0200 |
commit | 0471d1ac976316758644561cd34fa848bec26ccb (patch) | |
tree | fad4427556e66a6f8081cec7e4ec7948bf30a3fb | |
parent | c0221dafde6f42a86d835dc5e2a11c91cbd15946 (diff) | |
parent | de5a63f7b274d4b1548ec2d25143c02a010a44ef (diff) | |
download | wekan-0471d1ac976316758644561cd34fa848bec26ccb.tar.gz wekan-0471d1ac976316758644561cd34fa848bec26ccb.tar.bz2 wekan-0471d1ac976316758644561cd34fa848bec26ccb.zip |
Merge branch 'edge' of github.com:wekan/wekan into edge
-rw-r--r-- | models/import.js | 8 | ||||
-rw-r--r-- | models/wekanCreator.js | 8 |
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: { |