diff options
| author | Lauri Ojansivu <x@xet7.org> | 2019-01-31 14:28:53 +0200 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2019-01-31 14:28:53 +0200 |
| commit | b2986ca28975ef8b199fd2558db70dfa1729b522 (patch) | |
| tree | 2742cce0b4b74e589dd9a971f9c5a092b52820d4 /client | |
| parent | 271853e15587a5d4f9c4fc4ca05a1bd20c8e87ac (diff) | |
| parent | 7fc22ba0b73671cd4a0edcada710b6fb42199f7c (diff) | |
| download | wekan-b2986ca28975ef8b199fd2558db70dfa1729b522.tar.gz wekan-b2986ca28975ef8b199fd2558db70dfa1729b522.tar.bz2 wekan-b2986ca28975ef8b199fd2558db70dfa1729b522.zip | |
Merge branch 'edge' into meteor-1.8
Diffstat (limited to 'client')
| -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'); |