Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-02-27 18:34:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'mfilser-card_detail_popup_load_comments_from_board_search'

Browse source
This commit is contained in:
Lauri Ojansivu 2021-11-11 19:15:35 +02:00
commit 8cf392e1ea
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
client/components/activities/activities.js
View file

@ -13,14 +13,14 @@ BlazeComponent.extendComponent({
this.autorun(() => { this.autorun(() => {
let mode = this.data().mode; let mode = this.data().mode;
const capitalizedMode = Utils.capitalize(mode); const capitalizedMode = Utils.capitalize(mode);
let thisId, searchId; let searchId;
if (mode === 'linkedcard' || mode === 'linkedboard') { if (mode === 'linkedcard' || mode === 'linkedboard') {
thisId = Utils.getCurrentCardId(); searchId = Utils.getCurrentCard().linkedId;
searchId = Cards.findOne({ _id: thisId }).linkedId;
mode = mode.replace('linked', ''); mode = mode.replace('linked', '');
} else if (mode === 'card') {
searchId = Utils.getCurrentCardId();
} else { } else {
thisId = Session.get(`current${capitalizedMode}`); searchId = Session.get(`current${capitalizedMode}`);
searchId = thisId;
} }
const limit = this.page.get() * activitiesPerPage; const limit = this.page.get() * activitiesPerPage;
const user = Meteor.user(); const user = Meteor.user();

6
client/lib/cardSearch.js
View file

@ -33,11 +33,11 @@ export class CardSearchPagedComponent extends BlazeComponent {
that.hasResults.set(false); that.hasResults.set(false);
that.serverError.set(true); that.serverError.set(true);
// eslint-disable-next-line no-console // eslint-disable-next-line no-console
console.log('Error.reason:', error.reason); //console.log('Error.reason:', error.reason);
// eslint-disable-next-line no-console // eslint-disable-next-line no-console
console.log('Error.message:', error.message); //console.log('Error.message:', error.message);
// eslint-disable-next-line no-console // eslint-disable-next-line no-console
console.log('Error.stack:', error.stack); //console.log('Error.stack:', error.stack);
}, },
}; };
} }

2
config/query-classes.js
View file

@ -514,6 +514,6 @@ export class Query {
this.queryParams.text = text; this.queryParams.text = text;
// eslint-disable-next-line no-console // eslint-disable-next-line no-console
console.log('queryParams:', this.queryParams); //console.log('queryParams:', this.queryParams);
} }
} }

2
server/publications/cards.js
View file

@ -443,7 +443,7 @@ function buildSelector(queryParams) {
} }
// eslint-disable-next-line no-console // 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(); const query = new Query();
query.selector = selector; query.selector = selector;