diff options
author | Lauri Ojansivu <x@xet7.org> | 2020-04-04 01:36:43 +0300 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2020-04-04 01:36:43 +0300 |
commit | 76e832c3a6f48f41ed249e497b5daea431a873e4 (patch) | |
tree | 0e05e5f587a33d1392a42f192a9b498b72a26211 | |
parent | 28a9ab713162451128fe44ad9dd7a6886070449f (diff) | |
parent | b7fd79aef0d9c18f535fdd5a14e3d9b71e14f4de (diff) | |
download | wekan-76e832c3a6f48f41ed249e497b5daea431a873e4.tar.gz wekan-76e832c3a6f48f41ed249e497b5daea431a873e4.tar.bz2 wekan-76e832c3a6f48f41ed249e497b5daea431a873e4.zip |
Merge branch 'daniel-eder-feature/subtask-use-parent-swimlane'
-rw-r--r-- | client/components/cards/subtasks.js | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/client/components/cards/subtasks.js b/client/components/cards/subtasks.js index 34348fe1..cdc227fc 100644 --- a/client/components/cards/subtasks.js +++ b/client/components/cards/subtasks.js @@ -20,7 +20,13 @@ BlazeComponent.extendComponent({ const crtBoard = Boards.findOne(card.boardId); const targetBoard = crtBoard.getDefaultSubtasksBoard(); const listId = targetBoard.getDefaultSubtasksListId(); - const swimlaneId = targetBoard.getDefaultSwimline()._id; + + //Get the full swimlane data for the parent task. + const parentSwimlane = Swimlanes.findOne({boardId: crtBoard._id, _id: card.swimlaneId}); + //find the swimlane of the same name in the target board. + const targetSwimlane = Swimlanes.findOne({boardId: targetBoard._id, title: parentSwimlane.title}); + //If no swimlane with a matching title exists in the target board, fall back to the default swimlane. + const swimlaneId = targetSwimlane === undefined ? targetBoard.getDefaultSwimline()._id : targetSwimlane._id; if (title) { const _id = Cards.insert({ |