yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-17 10:38:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update updatedBy on publish / unpublish actions in the CM

Browse Source
This commit is contained in:
Alexandre Bodin 2021-11-18 16:13:28 +01:00
parent 82740ef6f0
commit 58e4deadb6
3 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/core/content-manager/server/controllers/collection-types.js
View File

@ -152,7 +152,7 @@ module.exports = {
}, },
async publish(ctx) { async publish(ctx) {
const { userAbility } = ctx.state; const { userAbility, user } = ctx.state;
const { id, model } = ctx.params; const { id, model } = ctx.params;
const entityManager = getService('entity-manager'); const entityManager = getService('entity-manager');
@ -172,13 +172,17 @@ module.exports = {
return ctx.forbidden(); return ctx.forbidden();
} }
const result = await entityManager.publish(entity, model); const result = await entityManager.publish(
entity,
setCreatorFields({ user, isEdition: true })({}),
model
);
ctx.body = await permissionChecker.sanitizeOutput(result); ctx.body = await permissionChecker.sanitizeOutput(result);
}, },
async unpublish(ctx) { async unpublish(ctx) {
const { userAbility } = ctx.state; const { userAbility, user } = ctx.state;
const { id, model } = ctx.params; const { id, model } = ctx.params;
const entityManager = getService('entity-manager'); const entityManager = getService('entity-manager');
@ -198,7 +202,11 @@ module.exports = {
return ctx.forbidden(); return ctx.forbidden();
} }
const result = await entityManager.unpublish(entity, model); const result = await entityManager.unpublish(
entity,
setCreatorFields({ user, isEdition: true })({}),
model
);
ctx.body = await permissionChecker.sanitizeOutput(result); ctx.body = await permissionChecker.sanitizeOutput(result);
}, },

16
packages/core/content-manager/server/controllers/single-types.js
View File

@ -114,7 +114,7 @@ module.exports = {
}, },
async publish(ctx) { async publish(ctx) {
const { userAbility } = ctx.state; const { userAbility, user } = ctx.state;
const { model } = ctx.params; const { model } = ctx.params;
const { query = {} } = ctx.request; const { query = {} } = ctx.request;
@ -135,13 +135,17 @@ module.exports = {
return ctx.forbidden(); return ctx.forbidden();
} }
const publishedEntity = await entityManager.publish(entity, model); const publishedEntity = await entityManager.publish(
entity,
setCreatorFields({ user, isEdition: true })({}),
model
);
ctx.body = await permissionChecker.sanitizeOutput(publishedEntity); ctx.body = await permissionChecker.sanitizeOutput(publishedEntity);
}, },
async unpublish(ctx) { async unpublish(ctx) {
const { userAbility } = ctx.state; const { userAbility, user } = ctx.state;
const { model } = ctx.params; const { model } = ctx.params;
const { query = {} } = ctx.request; const { query = {} } = ctx.request;
@ -162,7 +166,11 @@ module.exports = {
return ctx.forbidden(); return ctx.forbidden();
} }
const unpublishedEntity = await entityManager.unpublish(entity, model); const unpublishedEntity = await entityManager.unpublish(
entity,
setCreatorFields({ user, isEdition: true })({}),
model
);
ctx.body = await permissionChecker.sanitizeOutput(unpublishedEntity); ctx.body = await permissionChecker.sanitizeOutput(unpublishedEntity);
}, },

12
packages/core/content-manager/server/services/entity-manager.js
View File

@ -11,8 +11,8 @@ const { MANY_RELATIONS } = strapiUtils.relations.constants;
const omitPublishedAtField = omit(PUBLISHED_AT_ATTRIBUTE); const omitPublishedAtField = omit(PUBLISHED_AT_ATTRIBUTE);
const wrapWithEmitEvent = (event, fn) => async (entity, model) => { const wrapWithEmitEvent = (event, fn) => async (entity, body, model) => {
const result = await fn(entity, model); const result = await fn(entity, body, model);
const modelDef = strapi.getModel(model); const modelDef = strapi.getModel(model);
const sanitizedEntity = await strapiUtils.sanitize.sanitizers.defaultSanitizeOutput( const sanitizedEntity = await strapiUtils.sanitize.sanitizers.defaultSanitizeOutput(
@ -206,7 +206,7 @@ module.exports = ({ strapi }) => ({
return strapi.entityService.deleteMany(uid, params); return strapi.entityService.deleteMany(uid, params);
}, },
publish: wrapWithEmitEvent(ENTRY_PUBLISH, async (entity, uid) => { publish: wrapWithEmitEvent(ENTRY_PUBLISH, async (entity, body = {}, uid) => {
if (entity[PUBLISHED_AT_ATTRIBUTE]) { if (entity[PUBLISHED_AT_ATTRIBUTE]) {
throw new ApplicationError('already.published'); throw new ApplicationError('already.published');
} }
@ -214,19 +214,19 @@ module.exports = ({ strapi }) => ({
// validate the entity is valid for publication // validate the entity is valid for publication
await strapi.entityValidator.validateEntityCreation(strapi.getModel(uid), entity); await strapi.entityValidator.validateEntityCreation(strapi.getModel(uid), entity);
const data = { [PUBLISHED_AT_ATTRIBUTE]: new Date() }; const data = { ...body, [PUBLISHED_AT_ATTRIBUTE]: new Date() };
const params = { data, populate: getDeepPopulate(uid) }; const params = { data, populate: getDeepPopulate(uid) };
return strapi.entityService.update(uid, entity.id, params); return strapi.entityService.update(uid, entity.id, params);
}), }),
unpublish: wrapWithEmitEvent(ENTRY_UNPUBLISH, (entity, uid) => { unpublish: wrapWithEmitEvent(ENTRY_UNPUBLISH, (entity, body = {}, uid) => {
if (!entity[PUBLISHED_AT_ATTRIBUTE]) { if (!entity[PUBLISHED_AT_ATTRIBUTE]) {
throw new ApplicationError('already.draft'); throw new ApplicationError('already.draft');
} }
const data = { [PUBLISHED_AT_ATTRIBUTE]: null }; const data = { ...body, [PUBLISHED_AT_ATTRIBUTE]: null };
const params = { data, populate: getDeepPopulate(uid) }; const params = { data, populate: getDeepPopulate(uid) };