summaryrefslogtreecommitdiffstats
path: root/client/components/boards
diff options
context:
space:
mode:
Diffstat (limited to 'client/components/boards')
-rw-r--r--client/components/boards/boardBody.jade2
-rw-r--r--client/components/boards/boardBody.js8
-rw-r--r--client/components/boards/boardHeader.jade2
-rw-r--r--client/components/boards/boardHeader.js8
4 files changed, 12 insertions, 8 deletions
diff --git a/client/components/boards/boardBody.jade b/client/components/boards/boardBody.jade
index 32f8629f..017d0b0a 100644
--- a/client/components/boards/boardBody.jade
+++ b/client/components/boards/boardBody.jade
@@ -30,6 +30,8 @@ template(name="boardBody")
+listsGroup(currentBoard)
else if isViewCalendar
+calendarView
+ else
+ +listsGroup(currentBoard)
template(name="calendarView")
if isViewCalendar
diff --git a/client/components/boards/boardBody.js b/client/components/boards/boardBody.js
index 9105e624..301c0742 100644
--- a/client/components/boards/boardBody.js
+++ b/client/components/boards/boardBody.js
@@ -191,19 +191,19 @@ BlazeComponent.extendComponent({
isViewSwimlanes() {
const currentUser = Meteor.user();
if (!currentUser) return false;
- return (currentUser.profile.boardView === 'board-view-swimlanes');
+ return ((currentUser.profile || {}).boardView === 'board-view-swimlanes');
},
isViewLists() {
const currentUser = Meteor.user();
if (!currentUser) return true;
- return (currentUser.profile.boardView === 'board-view-lists');
+ return ((currentUser.profile || {}).boardView === 'board-view-lists');
},
isViewCalendar() {
const currentUser = Meteor.user();
if (!currentUser) return false;
- return (currentUser.profile.boardView === 'board-view-cal');
+ return ((currentUser.profile || {}).boardView === 'board-view-cal');
},
openNewListForm() {
@@ -335,6 +335,6 @@ BlazeComponent.extendComponent({
isViewCalendar() {
const currentUser = Meteor.user();
if (!currentUser) return false;
- return (currentUser.profile.boardView === 'board-view-cal');
+ return ((currentUser.profile || {}).boardView === 'board-view-cal');
},
}).register('calendarView');
diff --git a/client/components/boards/boardHeader.jade b/client/components/boards/boardHeader.jade
index 98fe2015..8bc61975 100644
--- a/client/components/boards/boardHeader.jade
+++ b/client/components/boards/boardHeader.jade
@@ -98,7 +98,7 @@ template(name="boardHeaderBar")
a.board-header-btn.js-toggle-board-view(
title="{{_ 'board-view'}}")
i.fa.fa-th-large
- span {{_ currentUser.profile.boardView}}
+ span {{#if currentUser.profile.boardView}}{{_ currentUser.profile.boardView}}{{else}}{{_ 'board-view-lists'}}{{/if}}
if canModifyBoard
a.board-header-btn.js-multiselection-activate(
diff --git a/client/components/boards/boardHeader.js b/client/components/boards/boardHeader.js
index 86fbebb3..f2b5c4f5 100644
--- a/client/components/boards/boardHeader.js
+++ b/client/components/boards/boardHeader.js
@@ -89,12 +89,14 @@ BlazeComponent.extendComponent({
},
'click .js-toggle-board-view'() {
const currentUser = Meteor.user();
- if (currentUser.profile.boardView === 'board-view-swimlanes') {
+ if ((currentUser.profile || {}).boardView === 'board-view-swimlanes') {
currentUser.setBoardView('board-view-cal');
- } else if (currentUser.profile.boardView === 'board-view-lists') {
+ } else if ((currentUser.profile || {}).boardView === 'board-view-lists') {
currentUser.setBoardView('board-view-swimlanes');
- } else if (currentUser.profile.boardView === 'board-view-cal') {
+ } else if ((currentUser.profile || {}).boardView === 'board-view-cal') {
currentUser.setBoardView('board-view-lists');
+ } else {
+ currentUser.setBoardView('board-view-swimlanes');
}
},
'click .js-toggle-sidebar'() {