merge develop

2025-12-28 15:44:59 +00:00 · 2019-07-30 11:15:47 +02:00 · 2019-07-30 11:15:47 +02:00 · dc8278fd1a
commit dc8278fd1a
parent cdf40a2bc1 8e8433662b
7 changed files with 10 additions and 10 deletions
--- a/examples/getstarted/api/article/models/Article.settings.json
+++ b/examples/getstarted/api/article/models/Article.settings.json
@ -15,7 +15,7 @@
      "type": "string"
    },
    "content": {
-      "type": "wysiwyg"
+      "type": "richtext"
    },
    "published": {
      "type": "boolean"
--- a/packages/strapi-hook-bookshelf/lib/buildDatabaseSchema.js
+++ b/packages/strapi-hook-bookshelf/lib/buildDatabaseSchema.js
@ -365,7 +365,7 @@ const getType = ({ definition, attribute, name, tableExists = false }) => {
  switch (attribute.type) {
    case 'uuid':
      return client === 'pg' ? 'uuid' : 'varchar(36)';
-    case 'wysiwyg':
+    case 'richtext':
    case 'text':
      return client === 'pg' ? 'text' : 'longtext';
    case 'json':
--- a/packages/strapi-hook-mongoose/lib/utils/index.js
+++ b/packages/strapi-hook-mongoose/lib/utils/index.js
@ -55,7 +55,7 @@ module.exports = (mongoose = Mongoose) => {
      case 'password':
      case 'string':
      case 'text':
-      case 'wysiwyg':
+      case 'richtext':
        return 'String';
      default:
        return undefined;
--- a/packages/strapi-plugin-content-manager/services/utils/configuration/layouts.js
+++ b/packages/strapi-plugin-content-manager/services/utils/configuration/layouts.js
@ -24,7 +24,7 @@ const typeToSize = type => {
      return MAX_ROW_SIZE / 3;
    case 'json':
    case 'group':
-    case 'wysiwyg':
+    case 'richtext':
      return MAX_ROW_SIZE;

    default:
--- a/packages/strapi-plugin-graphql/test/graphqlCrud.test.e2e.js
+++ b/packages/strapi-plugin-graphql/test/graphqlCrud.test.e2e.js
@ -13,7 +13,7 @@ const postModel = {
      name: 'name',
      params: {
        multiple: false,
-        type: 'wysiwyg',
+        type: 'richtext',
      },
    },
    {
--- a/packages/strapi-plugin-graphql/test/graphqlRelations.test.e2e.js
+++ b/packages/strapi-plugin-graphql/test/graphqlRelations.test.e2e.js
@ -17,14 +17,14 @@ const documentModel = {
      name: 'name',
      params: {
        multiple: false,
-        type: 'wysiwyg',
+        type: 'richtext',
      },
    },
    {
      name: 'content',
      params: {
        multiple: false,
-        type: 'wysiwyg',
+        type: 'richtext',
      },
    },
  ],
@ -40,7 +40,7 @@ const labelModel = {
      name: 'name',
      params: {
        multiple: false,
-        type: 'wysiwyg',
+        type: 'richtext',
      },
    },
    {
--- a/test/helpers/generators.js
+++ b/test/helpers/generators.js
@ -12,7 +12,7 @@ module.exports = {
        name: 'content',
        params: {
          multiple: false,
-          type: 'wysiwyg',
+          type: 'richtext',
        },
      },
      {
@ -121,7 +121,7 @@ module.exports = {
        name: 'description',
        params: {
          multiple: false,
-          type: 'wysiwyg',
+          type: 'richtext',
        },
      },
      {