Browse Source

Use database when logged in. Continued.

Thanks to xet7 !
Lauri Ojansivu 5 years ago
parent
commit
115d23f929

+ 2 - 1
client/components/boards/boardBody.js

@@ -199,7 +199,8 @@ BlazeComponent.extendComponent({
       let showDesktopDragHandles = false;
       let showDesktopDragHandles = false;
       currentUser = Meteor.user();
       currentUser = Meteor.user();
       if (currentUser) {
       if (currentUser) {
-        showDesktopDragHandles = (currentUser.profile || {}).showDesktopDragHandles;
+        showDesktopDragHandles = (currentUser.profile || {})
+          .showDesktopDragHandles;
       } else {
       } else {
         if (cookies.has('showDesktopDragHandles')) {
         if (cookies.has('showDesktopDragHandles')) {
           showDesktopDragHandles = true;
           showDesktopDragHandles = true;

+ 2 - 1
client/components/lists/list.js

@@ -122,7 +122,8 @@ BlazeComponent.extendComponent({
       let showDesktopDragHandles = false;
       let showDesktopDragHandles = false;
       currentUser = Meteor.user();
       currentUser = Meteor.user();
       if (currentUser) {
       if (currentUser) {
-        showDesktopDragHandles = (currentUser.profile || {}).showDesktopDragHandles;
+        showDesktopDragHandles = (currentUser.profile || {})
+          .showDesktopDragHandles;
       } else {
       } else {
         if (cookies.has('showDesktopDragHandles')) {
         if (cookies.has('showDesktopDragHandles')) {
           showDesktopDragHandles = true;
           showDesktopDragHandles = true;

+ 5 - 7
client/components/lists/listBody.js

@@ -713,13 +713,11 @@ BlazeComponent.extendComponent({
             .data()._id;
             .data()._id;
         }
         }
       }
       }
-    } else {
-      if (Utils.boardView() === 'board-view-swimlanes') {
-        this.swimlaneId = this.parentComponent()
-          .parentComponent()
-          .parentComponent()
-          .data()._id;
-      }
+    } else if (Utils.boardView() === 'board-view-swimlanes') {
+      this.swimlaneId = this.parentComponent()
+        .parentComponent()
+        .parentComponent()
+        .data()._id;
     }
     }
   },
   },
 
 

+ 4 - 2
client/components/swimlanes/swimlanes.js

@@ -102,7 +102,8 @@ function initSortable(boardComponent, $listsDom) {
     let showDesktopDragHandles = false;
     let showDesktopDragHandles = false;
     currentUser = Meteor.user();
     currentUser = Meteor.user();
     if (currentUser) {
     if (currentUser) {
-      showDesktopDragHandles = (currentUser.profile || {}).showDesktopDragHandles;
+      showDesktopDragHandles = (currentUser.profile || {})
+        .showDesktopDragHandles;
     } else {
     } else {
       import { Cookies } from 'meteor/ostrio:cookies';
       import { Cookies } from 'meteor/ostrio:cookies';
       const cookies = new Cookies();
       const cookies = new Cookies();
@@ -203,7 +204,8 @@ BlazeComponent.extendComponent({
           let showDesktopDragHandles = false;
           let showDesktopDragHandles = false;
           currentUser = Meteor.user();
           currentUser = Meteor.user();
           if (currentUser) {
           if (currentUser) {
-            showDesktopDragHandles = (currentUser.profile || {}).showDesktopDragHandles;
+            showDesktopDragHandles = (currentUser.profile || {})
+              .showDesktopDragHandles;
           } else {
           } else {
             import { Cookies } from 'meteor/ostrio:cookies';
             import { Cookies } from 'meteor/ostrio:cookies';
             const cookies = new Cookies();
             const cookies = new Cookies();

+ 6 - 6
client/lib/utils.js

@@ -10,9 +10,9 @@ Utils = {
         cookies.set('boardView', 'board-view-lists'); //true
         cookies.set('boardView', 'board-view-lists'); //true
       } else if (view === 'board-view-swimlanes') {
       } else if (view === 'board-view-swimlanes') {
         cookies.set('boardView', 'board-view-swimlanes'); //true
         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-collapse') {
+        //  cookies.set('boardView', 'board-view-swimlane'); //true
+        //  cookies.set('collapseSwimlane', 'true'); //true
       } else if (view === 'board-view-cal') {
       } else if (view === 'board-view-cal') {
         cookies.set('boardView', 'board-view-cal'); //true
         cookies.set('boardView', 'board-view-cal'); //true
       }
       }
@@ -29,7 +29,7 @@ Utils = {
   boardView() {
   boardView() {
     currentUser = Meteor.user();
     currentUser = Meteor.user();
     if (currentUser) {
     if (currentUser) {
-      return (currentUser.profile || {}).boardView
+      return (currentUser.profile || {}).boardView;
     } else {
     } else {
       import { Cookies } from 'meteor/ostrio:cookies';
       import { Cookies } from 'meteor/ostrio:cookies';
       const cookies = new Cookies();
       const cookies = new Cookies();
@@ -40,8 +40,8 @@ Utils = {
         //&& !cookies.has('collapseSwimlane')
         //&& !cookies.has('collapseSwimlane')
       ) {
       ) {
         return 'board-view-swimlanes';
         return 'board-view-swimlanes';
-      //} else if (cookies.has('collapseSwimlane')) {
-      //  return 'board-view-swimlanes';
+        //} else if (cookies.has('collapseSwimlane')) {
+        //  return 'board-view-swimlanes';
       } else if (cookies.get('boardView') === 'board-view-cal') {
       } else if (cookies.get('boardView') === 'board-view-cal') {
         return 'board-view-cal';
         return 'board-view-cal';
       } else {
       } else {