From 978dafc62b8355dd8b59587a8d4529d885a1f2f7 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 31 Jan 2019 14:19:14 +0200 Subject: - Fix: Bug: Not logged in public board page has calendar. Thanks to xet7 ! Closes #2061 --- client/components/boards/boardBody.jade | 9 +++++---- client/components/boards/boardBody.js | 7 ++++++- 2 files changed, 11 insertions(+), 5 deletions(-) (limited to 'client/components') 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'); -- cgit v1.2.3-1-g7c22