diff options
| author | Lauri Ojansivu <x@xet7.org> | 2019-03-06 03:15:51 +0200 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2019-03-06 03:15:51 +0200 |
| commit | e410205886b96e5bbc97331f69a098bd4a55cc3b (patch) | |
| tree | 66bf567a7ddeddc8c230333875f4ab91089d4e86 /client | |
| parent | 07433b800545affc5943cff151d516066bed26f8 (diff) | |
| parent | d807efd4f802f3e561654f5f9e31881275bdfb24 (diff) | |
| download | wekan-e410205886b96e5bbc97331f69a098bd4a55cc3b.tar.gz wekan-e410205886b96e5bbc97331f69a098bd4a55cc3b.tar.bz2 wekan-e410205886b96e5bbc97331f69a098bd4a55cc3b.zip | |
Merge branch 'edge' into meteor-1.8
Diffstat (limited to 'client')
| -rw-r--r-- | client/components/lists/list.js | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/client/components/lists/list.js b/client/components/lists/list.js index 043cb77c..868be2ce 100644 --- a/client/components/lists/list.js +++ b/client/components/lists/list.js @@ -67,7 +67,13 @@ BlazeComponent.extendComponent({ const nCards = MultiSelection.isActive() ? MultiSelection.count() : 1; const sortIndex = calculateIndex(prevCardDom, nextCardDom, nCards); const listId = Blaze.getData(ui.item.parents('.list').get(0))._id; - const swimlaneId = Blaze.getData(ui.item.parents('.swimlane').get(0))._id; + const currentBoard = Boards.findOne(Session.get('currentBoard')); + let swimlaneId = ''; + const boardView = Meteor.user().profile.boardView; + if (boardView === 'board-view-swimlanes') + swimlaneId = Blaze.getData(ui.item.parents('.swimlane').get(0))._id; + else if ((boardView === 'board-view-lists') || (boardView === 'board-view-cal')) + swimlaneId = currentBoard.getDefaultSwimline()._id; // Normally the jquery-ui sortable library moves the dragged DOM element // to its new position, which disrupts Blaze reactive updates mechanism |