diff options
author | Lauri Ojansivu <x@xet7.org> | 2018-02-07 15:24:22 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2018-02-07 15:24:22 +0200 |
commit | c1ddaaa4754c04b12cdebe8c891976243155b698 (patch) | |
tree | 1b266e8e31847ce9889d6c9185306d5b47432a7d /models | |
parent | 2dc71e97a71f819f2a6739a74be8fdd6fd8afd92 (diff) | |
parent | 5871a478e1280818f12fcb7250b7cbccf6907cf0 (diff) | |
download | wekan-c1ddaaa4754c04b12cdebe8c891976243155b698.tar.gz wekan-c1ddaaa4754c04b12cdebe8c891976243155b698.tar.bz2 wekan-c1ddaaa4754c04b12cdebe8c891976243155b698.zip |
Merge remote-tracking branch 'upstream/devel' into devel
Diffstat (limited to 'models')
-rw-r--r-- | models/cards.js | 5 | ||||
-rw-r--r-- | models/trelloCreator.js | 20 |
2 files changed, 22 insertions, 3 deletions
diff --git a/models/cards.js b/models/cards.js index d175a430..43e7d843 100644 --- a/models/cards.js +++ b/models/cards.js @@ -225,10 +225,9 @@ Cards.mutations({ swimlaneId, listId, boardId: list.boardId, + sort: sortIndex, }; - if (sortIndex) { - mutatedFields.sort = sortIndex; - } + return {$set: mutatedFields}; }, diff --git a/models/trelloCreator.js b/models/trelloCreator.js index 972673e6..2d85ee71 100644 --- a/models/trelloCreator.js +++ b/models/trelloCreator.js @@ -23,6 +23,8 @@ export class TrelloCreator { // Map of labels Trello ID => Wekan ID this.labels = {}; + // Default swimlane + this.swimlane = null; // Map of lists Trello ID => Wekan ID this.lists = {}; // Map of cards Trello ID => Wekan ID @@ -230,6 +232,7 @@ export class TrelloCreator { dateLastActivity: this._now(), description: card.desc, listId: this.lists[card.idList], + swimlaneId: this.swimlane, sort: card.pos, title: card.name, // we attribute the card to its creator if available @@ -397,6 +400,22 @@ export class TrelloCreator { }); } + createSwimlanes(boardId) { + const swimlaneToCreate = { + archived: false, + boardId, + // We are being defensing here by providing a default date (now) if the + // creation date wasn't found on the action log. This happen on old + // Wekan boards (eg from 2013) that didn't log the 'createList' action + // we require. + createdAt: this._now(), + title: 'Default', + }; + const swimlaneId = Swimlanes.direct.insert(swimlaneToCreate); + Swimlanes.direct.update(swimlaneId, {$set: {'updatedAt': this._now()}}); + this.swimlane = swimlaneId; + } + createChecklists(trelloChecklists) { trelloChecklists.forEach((checklist) => { if (this.cards[checklist.idCard]) { @@ -607,6 +626,7 @@ export class TrelloCreator { this.parseActions(board.actions); const boardId = this.createBoardAndLabels(board); this.createLists(board.lists, boardId); + this.createSwimlanes(boardId); this.createCards(board.cards, boardId); this.createChecklists(board.checklists); this.importActions(board.actions, boardId); |