Merge remote-tracking branch 'upstream/master'

1 files changed, 25 insertions, 6 deletions

diff --git a/client/components/lists/listBody.js b/client/components/lists/listBody.js
index 7d9e358b..c8e41a0b 100644
--- a/client/components/lists/listBody.js
+++ b/client/components/lists/listBody.js
@@ -701,12 +701,31 @@ BlazeComponent.extendComponent({
     this.listId = this.parentComponent().data()._id;
     this.swimlaneId = '';
 
-    const boardView = (Meteor.user().profile || {}).boardView;
-    if (boardView === 'board-view-swimlanes')
-      this.swimlaneId = this.parentComponent()
-        .parentComponent()
-        .parentComponent()
-        .data()._id;
+    const isSandstorm =
+      Meteor.settings &&
+      Meteor.settings.public &&
+      Meteor.settings.public.sandstorm;
+
+    if (isSandstorm) {
+      const user = Meteor.user();
+      if (user) {
+        const boardView = (Meteor.user().profile || {}).boardView;
+        if (boardView === 'board-view-swimlanes') {
+          this.swimlaneId = this.parentComponent()
+            .parentComponent()
+            .parentComponent()
+            .data()._id;
+        }
+      }
+    } else {
+      const boardView = (Meteor.user().profile || {}).boardView;
+      if (boardView === 'board-view-swimlanes') {
+        this.swimlaneId = this.parentComponent()
+          .parentComponent()
+          .parentComponent()
+          .data()._id;
+      }
+    }
   },
 
   onRendered() {