TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-28 22:43:30 +03:00
Code Issues Projects Releases Wiki Activity

Updated usage of paid param to filter on status (#1833)

Browse Source 
no-issue

This updates calls to the Admin API to list members to use `?filter=status:paid` instead of `?paid=true`
This commit is contained in:
Fabien 'egg' O'Carroll 2021-01-28 16:32:21 +00:00 committed by Daniel Lockyer
parent df453ed874
commit d699479c89
3 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ghost/admin/app/components/gh-publishmenu.js
View File

@ -218,7 +218,7 @@ export default Component.extend({
}),
countPaidMembersTask: task(function* () {
const result = yield this.store.query('member', {filter: 'subscribed:true', paid: true, limit: 1, page: 1});
const result = yield this.store.query('member', {filter: 'subscribed:true+status:paid', limit: 1, page: 1});
const paidMemberCount = result.meta.pagination.total;
const freeMemberCount = this.memberCount - paidMemberCount;
this.set('paidMemberCount', paidMemberCount);

2
ghost/admin/app/components/modal-confirm-email-send.js
View File

@ -22,7 +22,7 @@ export default ModalComponent.extend({
}),
countPaidMembersTask: task(function* () {
const result = yield this.store.query('member', {filter: 'subscribed:true', paid: true, limit: 1, page: 1});
const result = yield this.store.query('member', {filter: 'subscribed:true+status:paid', limit: 1, page: 1});
this.set('paidMemberCount', result.meta.pagination.total);
const freeMemberCount = this.model.memberCount - result.meta.pagination.total;
this.set('freeMemberCount', freeMemberCount);

45
ghost/admin/app/controllers/members.js
View File

@ -162,15 +162,23 @@ export default class MembersController extends Controller {
let exportUrl = ghostPaths().url.api('members/upload');
let downloadParams = new URLSearchParams();
downloadParams.set('limit', 'all');
let filters = [];
if (this.paidParam !== null) {
downloadParams.set('paid', this.paidParam);
if (this.paidParam === 'true') {
filters.push('status:paid');
} else {
filters.push('status:free');
}
}
if (this.label !== null) {
downloadParams.set('filter', `label:${this.label}`);
filters.push(`label:${this.label}`);
}
if (this.searchText !== '') {
downloadParams.set('search', this.searchText);
}
if (filters.length) {
downloadParams.set('filter', filters.join('+'));
}
let iframe = document.getElementById('iframeDownload');
if (!iframe) {
@ -278,8 +286,18 @@ export default class MembersController extends Controller {
this._startDate = startDate;
this.members = yield this.ellaSparse.array((range = {}, query = {}) => {
const labelFilter = label ? `label:'${label}'+` : '';
const paidQuery = paidParam ? {paid: paidParam} : {};
let filters = [];
if (label) {
filters.push(`label:'${label}'`);
}
if (paidParam !== null) {
if (paidParam === 'true') {
filters.push('status:paid');
} else {
filters.push('status:free');
}
}
filters.push(`created_at:<='${moment.utc(this._startDate).format('YYYY-MM-DD HH:mm:ss')}'`);
const searchQuery = searchParam ? {search: searchParam} : {};
const order = orderParam ? `${orderParam} desc` : `created_at desc`;
@ -287,8 +305,8 @@ export default class MembersController extends Controller {
order,
limit: range.length,
page: range.page,
filter: `${labelFilter}created_at:<='${moment.utc(this._startDate).format('YYYY-MM-DD HH:mm:ss')}'`
}, paidQuery, searchQuery, query);
filter: filters.join('+')
}, searchQuery, query);
return this.store.query('member', query).then((result) => {
return {
@ -305,12 +323,21 @@ export default class MembersController extends Controller {
*deleteMembersTask() {
let {label, paidParam, searchParam} = this;
let filter = label ? `label:${label}` : '';
let paidQuery = paidParam ? {paid: paidParam} : {};
let filters = [];
if (label) {
filters.push(`label:'${label}'`);
}
if (paidParam !== null) {
if (paidParam === 'true') {
filters.push('status:paid');
} else {
filters.push('status:free');
}
}
let searchQuery = searchParam ? {search: searchParam} : {};
let allQuery = !label && !paidParam && !searchParam ? {all: true} : {};
let query = new URLSearchParams(Object.assign({}, {filter}, paidQuery, searchQuery, allQuery));
let query = new URLSearchParams(Object.assign({}, {filter: filters.join('+')}, searchQuery, allQuery));
let url = `${this.ghostPaths.url.api('members')}?${query}`;
// response contains details of which members failed to be deleted