Merge pull request #3981 from Emile840/master

Fix bugs #3978 and #3979

client/components/boards/boardBody.jade

@@ -13,26 +13,29 @@ template(name="board")
     +spinner
 
 template(name="boardBody")
-  .board-wrapper(class=currentBoard.colorClass)
+  if notDisplayThisBoard
-    +sidebar
+    {{_ 'tableVisibilityMode-allowPrivateOnly'}}
-    .board-canvas.js-swimlanes(
+  else
-      class="{{#if Sidebar.isOpen}}is-sibling-sidebar-open{{/if}}"
+    .board-wrapper(class=currentBoard.colorClass)
-      class="{{#if MultiSelection.isActive}}is-multiselection-active{{/if}}"
+      +sidebar
-      class="{{#if draggingActive.get}}is-dragging-active{{/if}}")
+      .board-canvas.js-swimlanes(
-      if showOverlay.get
+        class="{{#if Sidebar.isOpen}}is-sibling-sidebar-open{{/if}}"
-        .board-overlay
+        class="{{#if MultiSelection.isActive}}is-multiselection-active{{/if}}"
-      if currentBoard.isTemplatesBoard
+        class="{{#if draggingActive.get}}is-dragging-active{{/if}}")
-        each currentBoard.swimlanes
+        if showOverlay.get
-          +swimlane(this)
+          .board-overlay
-      else if isViewSwimlanes
+        if currentBoard.isTemplatesBoard
-        each currentBoard.swimlanes
+          each currentBoard.swimlanes
-          +swimlane(this)
+            +swimlane(this)
-      else if isViewLists
+        else if isViewSwimlanes
-        +listsGroup(currentBoard)
+          each currentBoard.swimlanes
-      else if isViewCalendar
+            +swimlane(this)
-        +calendarView
+        else if isViewLists
-      else
+          +listsGroup(currentBoard)
-        +listsGroup(currentBoard)
+        else if isViewCalendar
+          +calendarView
+        else
+          +listsGroup(currentBoard)
 
 template(name="calendarView")
   if isViewCalendar

client/components/boards/boardBody.js

@@ -33,6 +33,7 @@ BlazeComponent.extendComponent({
 
 BlazeComponent.extendComponent({
   onCreated() {
+    Meteor.subscribe('tableVisibilityModeSettings');
     this.showOverlay = new ReactiveVar(false);
     this.draggingActive = new ReactiveVar(false);
     this._isDragging = false;
@@ -235,6 +236,16 @@ BlazeComponent.extendComponent({
     }
   },
 
+  notDisplayThisBoard(){
+    let allowPrivateVisibilityOnly = TableVisibilityModeSettings.findOne('tableVisibilityMode-allowPrivateOnly');
+    let currentBoard = Boards.findOne(Session.get('currentBoard'));
+    if(allowPrivateVisibilityOnly !== undefined && allowPrivateVisibilityOnly.booleanValue && currentBoard.permission == 'public'){
+      return true;
+    }
+
+    return false;
+  },
+
   isViewSwimlanes() {
     currentUser = Meteor.user();
     if (currentUser) {

client/components/boards/boardsList.js

@@ -22,6 +22,7 @@ Template.boardListHeaderBar.helpers({
 BlazeComponent.extendComponent({
   onCreated() {
     Meteor.subscribe('setting');
+    Meteor.subscribe('tableVisibilityModeSettings');
     let currUser = Meteor.user();
     let userLanguage;
     if(currUser && currUser.profile){
@@ -140,7 +141,7 @@ BlazeComponent.extendComponent({
     return (boolUserHasOrgs || boolUserHasTeams);
   },
   boards() {
-    const query = {
+    let query = {
       //archived: false,
       ////type: { $in: ['board','template-container'] },
       //type: 'board',
@@ -150,9 +151,14 @@ BlazeComponent.extendComponent({
         { $or:[] }
       ]
     };
+
+    let allowPrivateVisibilityOnly = TableVisibilityModeSettings.findOne('tableVisibilityMode-allowPrivateOnly');
+
     if (FlowRouter.getRouteName() === 'home'){
       query.$and[2].$or.push({'members.userId': Meteor.userId()});
-
+      if(allowPrivateVisibilityOnly !== undefined && allowPrivateVisibilityOnly.booleanValue){
+        query.$and.push({'permission': 'private'});
+      }
       const currUser = Users.findOne(Meteor.userId());
 
       // const currUser = Users.findOne(Meteor.userId(), {
@@ -183,7 +189,14 @@ BlazeComponent.extendComponent({
         query.$and[2].$or.push({'teams.teamId': {$in : teamsIds}});
       }
     }
-    else query.permission = 'public';
+    else if(allowPrivateVisibilityOnly !== undefined && !allowPrivateVisibilityOnly.booleanValue){
+      query = {
+        archived: false,
+        //type: { $in: ['board','template-container'] },
+        type: 'board',
+        permission: 'public',
+      };
+    }
 
     return Boards.find(query, {
       sort: { sort: 1 /* boards default sorting */ },