Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New content manager schemas + wysiwyg type #3668

Merged
merged 20 commits into from
Jul 23, 2019
Merged
Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions cypress/fixtures/api/product.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,7 @@
{
"name": "description",
"params": {
"type": "text",
"appearance": {
"WYSIWYG": false
}
"type": "text"
}
},
{
Expand Down Expand Up @@ -56,4 +53,4 @@
}
}
]
}
}
11 changes: 0 additions & 11 deletions packages/strapi-admin/config/layout.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,5 @@ module.exports = {
create: 'Admin.create',
update: 'Admin.update',
},
attributes: {
username: {
className: 'col-md-6',
},
email: {
className: 'col-md-6',
},
resetPasswordToken: {
className: 'd-none',
},
},
},
};
1 change: 1 addition & 0 deletions packages/strapi-hook-bookshelf/lib/buildDatabaseSchema.js
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,7 @@ const getType = ({ definition, attribute, name, tableExists = false }) => {
switch (attribute.type) {
case 'uuid':
return client === 'pg' ? 'uuid' : 'varchar(36)';
case 'wysiwyg':
case 'text':
return client === 'pg' ? 'text' : 'longtext';
case 'json':
Expand Down
1 change: 1 addition & 0 deletions packages/strapi-hook-mongoose/lib/utils/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ module.exports = (mongoose = Mongoose) => {
case 'password':
case 'string':
case 'text':
case 'wysiwyg':
return 'String';
default:
return undefined;
Expand Down
Loading