From d4f734eca73e9cb195ee2eff916a31a45074ba9d Mon Sep 17 00:00:00 2001 From: soupette Date: Mon, 19 Apr 2021 18:14:44 +0200 Subject: [PATCH] Enable i18n on media field when i18n is activated Signed-off-by: soupette --- .../admin/src/containers/FormModal/reducer.js | 1 + .../src/middlewares/extendCTBAttributeInitialDataMiddleware.js | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/reducer.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/reducer.js index e2a46b8bd9..44dd274a03 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/reducer.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/reducer.js @@ -255,6 +255,7 @@ const reducer = (state = initialState, action) => { allowedTypes: ['images', 'files', 'videos'], type: 'media', multiple: true, + ...options, }; } else if (attributeType === 'enumeration') { dataToSet = { ...options, type: 'enumeration', enum: [] }; diff --git a/packages/strapi-plugin-i18n/admin/src/middlewares/extendCTBAttributeInitialDataMiddleware.js b/packages/strapi-plugin-i18n/admin/src/middlewares/extendCTBAttributeInitialDataMiddleware.js index 0937e5de83..21f3718882 100644 --- a/packages/strapi-plugin-i18n/admin/src/middlewares/extendCTBAttributeInitialDataMiddleware.js +++ b/packages/strapi-plugin-i18n/admin/src/middlewares/extendCTBAttributeInitialDataMiddleware.js @@ -36,10 +36,9 @@ const extendCTBAttributeInitialDataMiddleware = () => { if ( action.type === 'ContentTypeBuilder/FormModal/SET_ATTRIBUTE_DATA_SCHEMA' && action.forTarget === 'contentType' && - !['relation', 'media', 'component'].includes(action.attributeType) && + !['relation', 'component'].includes(action.attributeType) && !action.isEditing ) { - // We need to make sure the plugin is installed return enhanceAction(); }