summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2019-03-05 23:38:47 +0200
committerLauri Ojansivu <x@xet7.org>2019-03-05 23:38:47 +0200
commit43a74fb99bb2ec2cbb8ed96fb7688dde1a7f312c (patch)
tree6721fe92e7704007baac69dd70ccf8b8765a18c6
parentb6b6be34f62decd6eccb8810d1596dc33f35aebe (diff)
parent1bef3a3f8ff4eac43bf97cc8b86d85e618b0e2ef (diff)
downloadwekan-43a74fb99bb2ec2cbb8ed96fb7688dde1a7f312c.tar.gz
wekan-43a74fb99bb2ec2cbb8ed96fb7688dde1a7f312c.tar.bz2
wekan-43a74fb99bb2ec2cbb8ed96fb7688dde1a7f312c.zip
Merge remote-tracking branch 'andresmanelli/edge' into edge
-rw-r--r--client/components/lists/list.js8
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