diff options
author | Sam X. Chen <sam.xi.chen@gmail.com> | 2019-08-29 22:08:41 -0400 |
---|---|---|
committer | Sam X. Chen <sam.xi.chen@gmail.com> | 2019-08-29 22:08:41 -0400 |
commit | 58155288fb27e0486f298b00798a550516d4d0ef (patch) | |
tree | 122b069c26cb41c4e607b462669033139282d2a9 /client/components/lists | |
parent | dd0682328bc26bbe852fb19a85131e4017c547b0 (diff) | |
parent | d1ab787215adb83064a5be4678e7073ba71fbb22 (diff) | |
download | wekan-58155288fb27e0486f298b00798a550516d4d0ef.tar.gz wekan-58155288fb27e0486f298b00798a550516d4d0ef.tar.bz2 wekan-58155288fb27e0486f298b00798a550516d4d0ef.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'client/components/lists')
-rw-r--r-- | client/components/lists/listBody.js | 31 |
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() { |