From f1b49e05ebaccbf45965b9bcb073a3f7265b8ba9 Mon Sep 17 00:00:00 2001
From: Martin Filser <github-wekan@linux-email.de>
Date: Thu, 28 Oct 2021 22:38:50 +0200
Subject: [PATCH] Card detail popup loads now comments if opened from board
 search

---
 client/components/activities/activities.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/components/activities/activities.js b/client/components/activities/activities.js
index eaad479ee..4d0e6846b 100644
--- a/client/components/activities/activities.js
+++ b/client/components/activities/activities.js
@@ -13,14 +13,14 @@ BlazeComponent.extendComponent({
     this.autorun(() => {
       let mode = this.data().mode;
       const capitalizedMode = Utils.capitalize(mode);
-      let thisId, searchId;
+      let searchId;
       if (mode === 'linkedcard' || mode === 'linkedboard') {
-        thisId = Utils.getCurrentCardId();
-        searchId = Cards.findOne({ _id: thisId }).linkedId;
+        searchId = Utils.getCurrentCard().linkedId;
         mode = mode.replace('linked', '');
+      } else if (mode == "card" ) {
+        searchId = Utils.getCurrentCardId();
       } else {
-        thisId = Session.get(`current${capitalizedMode}`);
-        searchId = thisId;
+        searchId = Session.get(`current${capitalizedMode}`);
       }
       const limit = this.page.get() * activitiesPerPage;
       const user = Meteor.user();