Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-09-22 01:50:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

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

Browse source
This commit is contained in:
Lauri Ojansivu 2019-03-11 19:37:52 +02:00
commit 0471d1ac97
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
models/import.js
View file

@ -3,10 +3,10 @@ import { WekanCreator } from './wekanCreator';
Meteor.methods({ Meteor.methods({
importBoard(board, data, importSource, currentBoard) { importBoard(board, data, importSource, currentBoard) {
//check(board, Object); check(board, Object);
//check(data, Object); check(data, Object);
//check(importSource, String); check(importSource, String);
//check(currentBoard, Match.Maybe(String)); check(currentBoard, Match.Maybe(String));
let creator; let creator;
switch (importSource) { switch (importSource) {
case 'trello': case 'trello':

8
models/wekanCreator.js
View file

@ -298,6 +298,10 @@ export class WekanCreator {
cardToCreate.members = wekanMembers; cardToCreate.members = wekanMembers;
} }
} }
// set color
if (card.color) {
cardToCreate.color = card.color;
}
// insert card // insert card
const cardId = Cards.direct.insert(cardToCreate); const cardId = Cards.direct.insert(cardToCreate);
// keep track of Wekan id => Wekan id // keep track of Wekan id => Wekan id
@ -484,6 +488,10 @@ export class WekanCreator {
title: swimlane.title, title: swimlane.title,
sort: swimlane.sort ? swimlane.sort : swimlaneIndex, sort: swimlane.sort ? swimlane.sort : swimlaneIndex,
}; };
// set color
if (swimlane.color) {
swimlaneToCreate.color = swimlane.color;
}
const swimlaneId = Swimlanes.direct.insert(swimlaneToCreate); const swimlaneId = Swimlanes.direct.insert(swimlaneToCreate);
Swimlanes.direct.update(swimlaneId, { Swimlanes.direct.update(swimlaneId, {
$set: { $set: {