mirror of
https://github.com/TryGhost/Ghost.git
synced 2024-12-25 11:55:03 +03:00
Merged heads/v5.22.8 into main
This commit is contained in:
commit
92c3d1e933
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "ghost-admin",
|
||||
"version": "5.22.7",
|
||||
"version": "5.22.8",
|
||||
"description": "Ember.js admin client for Ghost",
|
||||
"author": "Ghost Foundation",
|
||||
"homepage": "http://ghost.org",
|
||||
|
@ -62,6 +62,6 @@ module.exports = class FeedbackRepository {
|
||||
}
|
||||
|
||||
async getPostById(id) {
|
||||
return await this.#Post.findOne({id});
|
||||
return await this.#Post.findOne({id, status: 'all'});
|
||||
}
|
||||
};
|
||||
|
@ -40,7 +40,7 @@ class MemberAttributionServiceWrapper {
|
||||
Integration: models.Integration
|
||||
},
|
||||
attributionBuilder: this.attributionBuilder,
|
||||
isTrackingEnabled: !!settingsCache.get('members_track_sources')
|
||||
getTrackingEnabled: () => !!settingsCache.get('members_track_sources')
|
||||
});
|
||||
}
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "ghost",
|
||||
"version": "5.22.7",
|
||||
"version": "5.22.8",
|
||||
"description": "The professional publishing platform",
|
||||
"author": "Ghost Foundation",
|
||||
"homepage": "https://ghost.org",
|
||||
|
@ -5,15 +5,19 @@ class MemberAttributionService {
|
||||
*
|
||||
* @param {Object} deps
|
||||
* @param {Object} deps.attributionBuilder
|
||||
* @param {boolean} deps.isTrackingEnabled
|
||||
* @param {Object} deps.models
|
||||
* @param {Object} deps.models.MemberCreatedEvent
|
||||
* @param {Object} deps.models.SubscriptionCreatedEvent
|
||||
* @param {() => boolean} deps.getTrackingEnabled
|
||||
*/
|
||||
constructor({attributionBuilder, models, isTrackingEnabled}) {
|
||||
constructor({attributionBuilder, models, getTrackingEnabled}) {
|
||||
this.models = models;
|
||||
this.attributionBuilder = attributionBuilder;
|
||||
this.isTrackingEnabled = isTrackingEnabled;
|
||||
this._getTrackingEnabled = getTrackingEnabled;
|
||||
}
|
||||
|
||||
get isTrackingEnabled() {
|
||||
return this._getTrackingEnabled();
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -13,7 +13,7 @@ describe('MemberAttributionService', function () {
|
||||
describe('getAttributionFromContext', function () {
|
||||
it('returns null if no context is provided', async function () {
|
||||
const service = new MemberAttributionService({
|
||||
isTrackingEnabled: true
|
||||
getTrackingEnabled: () => true
|
||||
});
|
||||
const attribution = await service.getAttributionFromContext();
|
||||
|
||||
@ -31,7 +31,7 @@ describe('MemberAttributionService', function () {
|
||||
|
||||
it('returns attribution for importer context', async function () {
|
||||
const service = new MemberAttributionService({
|
||||
isTrackingEnabled: true
|
||||
getTrackingEnabled: () => true
|
||||
});
|
||||
const attribution = await service.getAttributionFromContext({importer: true});
|
||||
|
||||
@ -40,7 +40,7 @@ describe('MemberAttributionService', function () {
|
||||
|
||||
it('returns attribution for admin context', async function () {
|
||||
const service = new MemberAttributionService({
|
||||
isTrackingEnabled: true
|
||||
getTrackingEnabled: () => true
|
||||
});
|
||||
const attribution = await service.getAttributionFromContext({user: 'abc'});
|
||||
|
||||
@ -49,7 +49,7 @@ describe('MemberAttributionService', function () {
|
||||
|
||||
it('returns attribution for api without integration context', async function () {
|
||||
const service = new MemberAttributionService({
|
||||
isTrackingEnabled: true
|
||||
getTrackingEnabled: () => true
|
||||
});
|
||||
const attribution = await service.getAttributionFromContext({
|
||||
api_key: 'abc'
|
||||
@ -69,7 +69,7 @@ describe('MemberAttributionService', function () {
|
||||
}
|
||||
}
|
||||
},
|
||||
isTrackingEnabled: true
|
||||
getTrackingEnabled: () => true
|
||||
});
|
||||
const attribution = await service.getAttributionFromContext({
|
||||
api_key: 'abc',
|
||||
@ -96,7 +96,7 @@ describe('MemberAttributionService', function () {
|
||||
};
|
||||
}
|
||||
},
|
||||
isTrackingEnabled: true
|
||||
getTrackingEnabled: () => true
|
||||
});
|
||||
const model = {
|
||||
id: 'event_id',
|
||||
@ -130,7 +130,7 @@ describe('MemberAttributionService', function () {
|
||||
};
|
||||
}
|
||||
},
|
||||
isTrackingEnabled: true
|
||||
getTrackingEnabled: () => true
|
||||
});
|
||||
const model = {
|
||||
id: 'event_id',
|
||||
@ -170,7 +170,7 @@ describe('MemberAttributionService', function () {
|
||||
};
|
||||
}
|
||||
},
|
||||
isTrackingEnabled: true
|
||||
getTrackingEnabled: () => true
|
||||
});
|
||||
const model = {
|
||||
id: 'event_id',
|
||||
|
Loading…
Reference in New Issue
Block a user