yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-16 01:57:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename to isResizable

Browse Source
This commit is contained in:
Rémi de Juvigny 2023-04-17 12:02:08 +02:00
parent 96ba7cc431
commit d06af0d8fc
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/ModalForm.js
View File

@ -152,7 +152,7 @@ const ModalForm = ({ onMetaChange, onSizeChange }) => {
return ( return (
<> <>
{metaFields} {metaFields}
{fieldSizeInfo.resizable && sizeField} {fieldSizeInfo.isResizable && sizeField}
{hasTimePicker && timeStepField} {hasTimePicker && timeStepField}
</> </>
); );

6
packages/core/admin/admin/src/content-manager/pages/EditSettingsView/tests/reducer.test.js
View File

@ -1,9 +1,9 @@
import reducer from '../reducer'; import reducer from '../reducer';
const fieldSizes = { const fieldSizes = {
richtext: { default: 12, resizable: false }, richtext: { default: 12, isResizable: false },
string: { default: 6, resizable: true }, string: { default: 6, isResizable: true },
boolean: { default: 4, resizable: true }, boolean: { default: 4, isResizable: true },
}; };
describe('CONTENT MANAGER | CONTAINERS | EditSettingsView | reducer', () => { describe('CONTENT MANAGER | CONTAINERS | EditSettingsView | reducer', () => {

6
packages/core/content-manager/server/services/field-sizes.js
View File

@ -2,17 +2,17 @@
const needsFullSize = { const needsFullSize = {
default: 12, default: 12,
resizable: false, isResizable: false,
}; };
const smallSize = { const smallSize = {
default: 4, default: 4,
resizable: true, isResizable: true,
}; };
const defaultSize = { const defaultSize = {
default: 6, default: 6,
resizable: true, isResizable: true,
}; };
const fieldSizes = { const fieldSizes = {

2
packages/core/content-manager/server/services/utils/configuration/layouts.js
View File

@ -12,7 +12,7 @@ const isAllowedFieldSize = (type, size) => {
const fieldSize = getFieldSize(type); const fieldSize = getFieldSize(type);
// Check if field was locked to another size // Check if field was locked to another size
if (!fieldSize.resizable && size !== fieldSize.default) { if (!fieldSize.isResizable && size !== fieldSize.default) {
return false; return false;
} }