yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-13 19:27:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'i18n/rbac-rework-front' of github.com:strapi/strapi into i18n/cm-copy-from-locale

Browse Source 
Signed-off-by: soupette <cyril.lpz@gmail.com>
This commit is contained in:
soupette 2021-03-17 15:38:29 +01:00
commit 2e4e66bc01
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/strapi-plugin-content-manager/admin/src/components/InputJSONWithErrors/index.js
View File

@ -42,8 +42,6 @@ class InputJSONWithErrors extends React.Component {
...rest ...rest
} = this.props; } = this.props;
console.log({ labelIcon });
const handleBlur = isFunction(onBlur) ? onBlur : this.handleBlur; const handleBlur = isFunction(onBlur) ? onBlur : this.handleBlur;
return ( return (

2
packages/strapi-plugin-i18n/admin/src/utils/mutateCTBContentTypeSchema.js
View File

@ -38,7 +38,7 @@ const mutateCTBContentTypeSchema = (nextSchema, prevSchema) => {
} }
const isNextSchemaLocalized = get(nextSchema, localizedPath, false); const isNextSchemaLocalized = get(nextSchema, localizedPath, false);
const isPrevSchemaLocalized = get(prevSchema, localizedPath, false); const isPrevSchemaLocalized = get(prevSchema, ['schema', ...localizedPath], false);
// No need to perform modification on the schema, if the i18n feature was not changed // No need to perform modification on the schema, if the i18n feature was not changed
// at the ct level // at the ct level

10
packages/strapi-plugin-i18n/admin/src/utils/tests/mutateCTBContentTypeSchema.test.js
View File

@ -89,10 +89,12 @@ describe('i18n | utils ', () => {
expect( expect(
mutateSchema(ctSchema, { mutateSchema(ctSchema, {
pluginOptions: { schema: {
pluginA: { foo: 'bar' }, pluginOptions: {
i18n: { localized: true }, pluginA: { foo: 'bar' },
pluginB: { foo: 'bar' }, i18n: { localized: true },
pluginB: { foo: 'bar' },
},
}, },
}) })
).toEqual(ctSchema); ).toEqual(ctSchema);