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 /client/components | |
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 'client/components')
-rw-r--r-- | client/components/cards/cardDetails.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js index 94a938f0..d70167ce 100644 --- a/client/components/cards/cardDetails.js +++ b/client/components/cards/cardDetails.js @@ -172,13 +172,13 @@ Template.cardDetailsActionsPopup.events({ 'click .js-copy-card': Popup.open('copyCard'), 'click .js-move-card-to-top' (evt) { evt.preventDefault(); - const minOrder = _.min(this.list().cards().map((c) => c.sort)); - this.move(this.listId, minOrder - 1); + const minOrder = _.min(this.list().cards(this.swimlaneId).map((c) => c.sort)); + this.move(this.swimlaneId, this.listId, minOrder - 1); }, 'click .js-move-card-to-bottom' (evt) { evt.preventDefault(); - const maxOrder = _.max(this.list().cards().map((c) => c.sort)); - this.move(this.listId, maxOrder + 1); + const maxOrder = _.max(this.list().cards(this.swimlaneId).map((c) => c.sort)); + this.move(this.swimlaneId, this.listId, maxOrder + 1); }, 'click .js-archive' (evt) { evt.preventDefault(); @@ -215,7 +215,7 @@ Template.moveCardPopup.events({ // instead from a “component” state. const card = Cards.findOne(Session.get('currentCard')); const newListId = this._id; - card.move(newListId); + card.move(card.swimlaneId, newListId, 0); Popup.close(); }, }); |