mirror of
https://github.com/wekan/wekan.git
synced 2026-02-06 16:41:48 +01:00
Merge branch 'edge' into meteor-1.8
This commit is contained in:
commit
eabf24d750
2 changed files with 19 additions and 5 deletions
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue