Use database when logged in. Continued.

Thanks to xet7 !

1 files changed, 31 insertions, 34 deletions

diff --git a/client/lib/utils.js b/client/lib/utils.js
index 7b4990e7..80ec412c 100644
--- a/client/lib/utils.js
+++ b/client/lib/utils.js
@@ -3,26 +3,18 @@ Utils = {
     import { Cookies } from 'meteor/ostrio:cookies';
     const cookies = new Cookies();
     currentUser = Meteor.user();
-    if (view === 'board-view-lists') {
-      cookies.set('boardView', 'board-view-lists'); //true
-      if (currentUser) {
-        Meteor.user().setBoardView('board-view-lists');
-      }
-    } else if (view === 'board-view-swimlanes') {
-      cookies.set('boardView', 'board-view-swimlanes'); //true
-      if (currentUser) {
-        Meteor.user().setBoardView('board-view-swimlanes');
-      }
-    } else if (view === 'board-view-collapse') {
-      cookies.set('boardView', 'board-view-swimlane'); //true
-      cookies.set('collapseSwimlane', 'true'); //true
-      if (currentUser) {
-        Meteor.user().setBoardView('board-view-swimlane');
-      }
-    } else if (view === 'board-view-cal') {
-      cookies.set('boardView', 'board-view-cal'); //true
-      if (currentUser) {
-        Meteor.user().setBoardView('board-view-cal');
+    if (currentUser) {
+      Meteor.user().setBoardView(view);
+    } else {
+      if (view === 'board-view-lists') {
+        cookies.set('boardView', 'board-view-lists'); //true
+      } else if (view === 'board-view-swimlanes') {
+        cookies.set('boardView', 'board-view-swimlanes'); //true
+      //} else if (view === 'board-view-collapse') {
+      //  cookies.set('boardView', 'board-view-swimlane'); //true
+      //  cookies.set('collapseSwimlane', 'true'); //true
+      } else if (view === 'board-view-cal') {
+        cookies.set('boardView', 'board-view-cal'); //true
       }
     }
   },
@@ -35,21 +27,26 @@ Utils = {
   },
 
   boardView() {
-    import { Cookies } from 'meteor/ostrio:cookies';
-    const cookies = new Cookies();
-    if (cookies.get('boardView') === 'board-view-lists') {
-      return 'board-view-lists';
-    } else if (
-      cookies.get('boardView') === 'board-view-swimlanes' &&
-      !cookies.has('collapseSwimlane')
-    ) {
-      return 'board-view-swimlanes';
-    } else if (cookies.has('collapseSwimlane')) {
-      return 'board-view-swimlanes';
-    } else if (cookies.get('boardView') === 'board-view-cal') {
-      return 'board-view-cal';
+    currentUser = Meteor.user();
+    if (currentUser) {
+      return (currentUser.profile || {}).boardView
     } else {
-      return false;
+      import { Cookies } from 'meteor/ostrio:cookies';
+      const cookies = new Cookies();
+      if (cookies.get('boardView') === 'board-view-lists') {
+        return 'board-view-lists';
+      } else if (
+        cookies.get('boardView') === 'board-view-swimlanes'
+        //&& !cookies.has('collapseSwimlane')
+      ) {
+        return 'board-view-swimlanes';
+      //} else if (cookies.has('collapseSwimlane')) {
+      //  return 'board-view-swimlanes';
+      } else if (cookies.get('boardView') === 'board-view-cal') {
+        return 'board-view-cal';
+      } else {
+        return false;
+      }
     }
   },