From f1b49e05ebaccbf45965b9bcb073a3f7265b8ba9 Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Thu, 28 Oct 2021 22:38:50 +0200 Subject: [PATCH 1/3] 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(); From 0991e54c221dd32b8703167758e3d089f6e32ace Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 11 Nov 2021 19:04:17 +0200 Subject: [PATCH 2/3] Fixed typo. --- client/components/activities/activities.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/components/activities/activities.js b/client/components/activities/activities.js index 4d0e6846b..cc5237097 100644 --- a/client/components/activities/activities.js +++ b/client/components/activities/activities.js @@ -17,7 +17,7 @@ BlazeComponent.extendComponent({ if (mode === 'linkedcard' || mode === 'linkedboard') { searchId = Utils.getCurrentCard().linkedId; mode = mode.replace('linked', ''); - } else if (mode == "card" ) { + } else if (mode === 'card') { searchId = Utils.getCurrentCardId(); } else { searchId = Session.get(`current${capitalizedMode}`); From ea01c5c1b947d78d0d8afc80190955dbf8c285a2 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 11 Nov 2021 19:12:25 +0200 Subject: [PATCH 3/3] Disable console.log --- client/lib/cardSearch.js | 6 +++--- config/query-classes.js | 2 +- server/publications/cards.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/lib/cardSearch.js b/client/lib/cardSearch.js index eb7eed64e..6daada3c8 100644 --- a/client/lib/cardSearch.js +++ b/client/lib/cardSearch.js @@ -33,11 +33,11 @@ export class CardSearchPagedComponent extends BlazeComponent { that.hasResults.set(false); that.serverError.set(true); // eslint-disable-next-line no-console - console.log('Error.reason:', error.reason); + //console.log('Error.reason:', error.reason); // eslint-disable-next-line no-console - console.log('Error.message:', error.message); + //console.log('Error.message:', error.message); // eslint-disable-next-line no-console - console.log('Error.stack:', error.stack); + //console.log('Error.stack:', error.stack); }, }; } diff --git a/config/query-classes.js b/config/query-classes.js index f86a0af21..32b0ff58e 100644 --- a/config/query-classes.js +++ b/config/query-classes.js @@ -514,6 +514,6 @@ export class Query { this.queryParams.text = text; // eslint-disable-next-line no-console - console.log('queryParams:', this.queryParams); + //console.log('queryParams:', this.queryParams); } } diff --git a/server/publications/cards.js b/server/publications/cards.js index cbab66f99..caa9190a5 100644 --- a/server/publications/cards.js +++ b/server/publications/cards.js @@ -443,7 +443,7 @@ function buildSelector(queryParams) { } // eslint-disable-next-line no-console - console.log('cards selector:', JSON.stringify(selector, null, 2)); + //console.log('cards selector:', JSON.stringify(selector, null, 2)); const query = new Query(); query.selector = selector;