diff options
author | Lauri Ojansivu <x@xet7.org> | 2019-01-31 14:19:14 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2019-01-31 14:19:14 +0200 |
commit | 978dafc62b8355dd8b59587a8d4529d885a1f2f7 (patch) | |
tree | 7a15e3fcb9c971764d33968546d54481aea09ab1 | |
parent | 8919d8fb7d291c09ecefe17f7ee0c14ab2da3802 (diff) | |
download | wekan-978dafc62b8355dd8b59587a8d4529d885a1f2f7.tar.gz wekan-978dafc62b8355dd8b59587a8d4529d885a1f2f7.tar.bz2 wekan-978dafc62b8355dd8b59587a8d4529d885a1f2f7.zip |
- Fix: Bug: Not logged in public board page has calendar.
Thanks to xet7 !
Closes #2061
-rw-r--r-- | client/components/boards/boardBody.jade | 9 | ||||
-rw-r--r-- | client/components/boards/boardBody.js | 7 |
2 files changed, 11 insertions, 5 deletions
diff --git a/client/components/boards/boardBody.jade b/client/components/boards/boardBody.jade index 9e4b9c61..3a40921d 100644 --- a/client/components/boards/boardBody.jade +++ b/client/components/boards/boardBody.jade @@ -29,7 +29,8 @@ template(name="boardBody") +calendarView template(name="calendarView") - .calendar-view.swimlane - if currentCard - +cardDetails(currentCard) - +fullcalendar(calendarOptions) + if isViewCalendar + .calendar-view.swimlane + if currentCard + +cardDetails(currentCard) + +fullcalendar(calendarOptions) diff --git a/client/components/boards/boardBody.js b/client/components/boards/boardBody.js index ae5b67fd..2de8777a 100644 --- a/client/components/boards/boardBody.js +++ b/client/components/boards/boardBody.js @@ -134,7 +134,7 @@ BlazeComponent.extendComponent({ isViewCalendar() { const currentUser = Meteor.user(); - if (!currentUser) return true; + if (!currentUser) return false; return (currentUser.profile.boardView === 'board-view-cal'); }, @@ -264,4 +264,9 @@ BlazeComponent.extendComponent({ }, }; }, + isViewCalendar() { + const currentUser = Meteor.user(); + if (!currentUser) return false; + return (currentUser.profile.boardView === 'board-view-cal'); + }, }).register('calendarView'); |