From 801d0aacf00eace05ec70d6f0229f2a752f119cd Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Mon, 11 Jan 2021 05:23:11 +0200
Subject: [PATCH] Due Cards and Broken Cards: In All Users view, fixed to show
 cards only from other users Public Boards. Not anymore from private boards.

Thanks to xet7 !

Related #1667
---
 client/components/main/brokenCards.js |  2 ++
 client/components/main/dueCards.js    | 14 +++++++-------
 client/components/main/myCards.js     |  2 +-
 server/publications/cards.js          | 28 +++++++++++++--------------
 4 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/client/components/main/brokenCards.js b/client/components/main/brokenCards.js
index c3eb06f77..6348a50ed 100644
--- a/client/components/main/brokenCards.js
+++ b/client/components/main/brokenCards.js
@@ -18,6 +18,8 @@ BlazeComponent.extendComponent({
         { boardId: { $in: [null, ''] } },
         { swimlaneId: { $in: [null, ''] } },
         { listId: { $in: [null, ''] } },
+        { permission: 'public' },
+        { members: { $elemMatch: { userId: user._id, isActive: true } } },
       ],
     };
 
diff --git a/client/components/main/dueCards.js b/client/components/main/dueCards.js
index d4a4abb5b..8509790f2 100644
--- a/client/components/main/dueCards.js
+++ b/client/components/main/dueCards.js
@@ -82,14 +82,14 @@ BlazeComponent.extendComponent({
     let selector = {
       archived: false,
     };
-    // if user is not an admin allow her to see cards only from public boards
+    // for every user including admin allow her to see cards only from public boards
     // or those where she is a member
-    if (!user.isAdmin) {
-      selector.$or = [
-        { permission: 'public' },
-        { members: { $elemMatch: { userId: user._id, isActive: true } } },
-      ];
-    }
+    //if (!user.isAdmin) {
+    selector.$or = [
+      { permission: 'public' },
+      { members: { $elemMatch: { userId: user._id, isActive: true } } },
+    ];
+    //}
     Boards.find(selector).forEach(board => {
       permiitedBoards.push(board._id);
     });
diff --git a/client/components/main/myCards.js b/client/components/main/myCards.js
index 6a9bbd837..13eb3e519 100644
--- a/client/components/main/myCards.js
+++ b/client/components/main/myCards.js
@@ -59,7 +59,7 @@ BlazeComponent.extendComponent({
 
   myCardsSort() {
     // eslint-disable-next-line no-console
-    console.log('sort:', Utils.myCardsSort());
+    //console.log('sort:', Utils.myCardsSort());
     return Utils.myCardsSort();
   },
 
diff --git a/server/publications/cards.js b/server/publications/cards.js
index fd9355d01..ae775c031 100644
--- a/server/publications/cards.js
+++ b/server/publications/cards.js
@@ -93,14 +93,14 @@ Meteor.publish('dueCards', function(allUsers = false) {
   let selector = {
     archived: false,
   };
-  // if user is not an admin allow her to see cards only from boards where
+  // for admins and users, allow her to see cards only from boards where
   // she is a member
-  if (!user.isAdmin) {
-    selector.$or = [
-      { permission: 'public' },
-      { members: { $elemMatch: { userId: user._id, isActive: true } } },
-    ];
-  }
+  //if (!user.isAdmin) {
+  selector.$or = [
+    { permission: 'public' },
+    { members: { $elemMatch: { userId: user._id, isActive: true } } },
+  ];
+  //}
   Boards.find(selector).forEach(board => {
     permiitedBoards.push(board._id);
   });
@@ -180,14 +180,14 @@ Meteor.publish('brokenCards', function() {
 
   const permiitedBoards = [null];
   let selector = {};
-  // if user is not an admin allow her to see cards only from boards where
+  // for admins and users, if user is not an admin allow her to see cards only from boards where
   // she is a member
-  if (!user.isAdmin) {
-    selector.$or = [
-      { permission: 'public' },
-      { members: { $elemMatch: { userId: user._id, isActive: true } } },
-    ];
-  }
+  //if (!user.isAdmin) {
+  selector.$or = [
+    { permission: 'public' },
+    { members: { $elemMatch: { userId: user._id, isActive: true } } },
+  ];
+  //}
   Boards.find(selector).forEach(board => {
     permiitedBoards.push(board._id);
   });