diff options
| author | Lauri Ojansivu <x@xet7.org> | 2019-02-03 02:26:23 +0200 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2019-02-03 02:26:23 +0200 |
| commit | eabf24d750edbcee76d5f2d0cecb741effd1a254 (patch) | |
| tree | 374ce32f252559cfaa41bb7bbc0f081e39fbf12c | |
| parent | e2475ad73fbba85679fa27990f68e13b8755c796 (diff) | |
| parent | a7aeb491bae1a8492aafdd7f045785c78f2a6d63 (diff) | |
| download | wekan-eabf24d750edbcee76d5f2d0cecb741effd1a254.tar.gz wekan-eabf24d750edbcee76d5f2d0cecb741effd1a254.tar.bz2 wekan-eabf24d750edbcee76d5f2d0cecb741effd1a254.zip | |
Merge branch 'edge' into meteor-1.8
| -rw-r--r-- | CHANGELOG.md | 8 | ||||
| -rw-r--r-- | client/components/swimlanes/swimlanes.js | 16 |
2 files changed, 19 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index d6665580..d8b12f42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# Upcoming Wekan release + +- [Fix: Not displaying card content of public board: Snap, Docker and Sandstorm Shared Wekan Board + Link](https://github.com/wekan/wekan/issues/1623) with + [code from ChronikEwok](https://github.com/ChronikEwok/wekan/commit/cad9b20451bb6149bfb527a99b5001873b06c3de). + +Thanks to ChronikEwok for contributions. + # v2.14 2019-02-02 Wekan release This release fixes the following bugs: diff --git a/client/components/swimlanes/swimlanes.js b/client/components/swimlanes/swimlanes.js index 71317714..bf53fd28 100644 --- a/client/components/swimlanes/swimlanes.js +++ b/client/components/swimlanes/swimlanes.js @@ -3,14 +3,20 @@ const { calculateIndex, enableClickOnTouch } = Utils; function currentCardIsInThisList(listId, swimlaneId) { const currentCard = Cards.findOne(Session.get('currentCard')); const currentUser = Meteor.user(); - if (currentUser.profile.boardView === 'board-view-lists') - return currentCard && currentCard.listId === listId; - else if (currentUser.profile.boardView === 'board-view-swimlanes') + if (currentUser && currentUser.profile.boardView === 'board-view-swimlanes') return currentCard && currentCard.listId === listId && currentCard.swimlaneId === swimlaneId; else if (currentUser.profile.boardView === 'board-view-cal') return currentCard; - else - return false; + else // Default view: board-view-lists + return currentCard && currentCard.listId === listId; + // https://github.com/wekan/wekan/issues/1623 + // https://github.com/ChronikEwok/wekan/commit/cad9b20451bb6149bfb527a99b5001873b06c3de + // TODO: In public board, if you would like to switch between List/Swimlane view, you could + // 1) If there is no view cookie, save to cookie board-view-lists + // board-view-lists / board-view-swimlanes / board-view-cal + // 2) If public user changes clicks board-view-lists then change view and + // then change view and save cookie with view value + // without using currentuser above, because currentuser is null. } function initSortable(boardComponent, $listsDom) { |