Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-03-11 02:12:21 -05:00
Code Issues Activity

Fixed issue with filter transform not applying to bulk operations

Browse source
This commit is contained in:
Matt Hanley 2022-05-11 15:17:41 +01:00 • committed by Matt Hanley
parent 152a2ea41f
commit f0798578c4
1 changed files with 6 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
ghost/members-api/lib/repositories/member.js
View file

@ -566,24 +566,11 @@ module.exports = class MemberRepository {
});
}
const filterOptions = {};
if (options.transacting) {
filterOptions.transacting = options.transacting;
}
if (options.context) {
filterOptions.context = options.context;
}
const filterOptions = _.pick(options, ['transacting', 'context']);
if (all !== true) {
if (filter) {
filterOptions.filter = filter;
}
if (search) {
filterOptions.search = search;
}
// Include mongoTransformer to apply subscribed:{true|false} => newsletter relation mapping
Object.assign(filterOptions, _.pick(options, ['filter', 'search', 'mongoTransformer']));
}
const memberRows = await this._Member.getFilteredCollectionQuery(filterOptions)
@ -616,24 +603,11 @@ module.exports = class MemberRepository {
});
}
const filterOptions = {};
if (options.transacting) {
filterOptions.transacting = options.transacting;
}
if (options.context) {
filterOptions.context = options.context;
}
const filterOptions = _.pick(options, ['transacting', 'context']);
if (all !== true) {
if (filter) {
filterOptions.filter = filter;
}
if (search) {
filterOptions.search = search;
}
// Include mongoTransformer to apply subscribed:{true|false} => newsletter relation mapping
Object.assign(filterOptions, _.pick(options, ['filter', 'search', 'mongoTransformer']));
}
const memberRows = await this._Member.getFilteredCollectionQuery(filterOptions)