Merge pull request strapi#11713 from strapi/v4/fix-unique-on-publish

Pass entity down to the validatCreation for publish and handle undefined value
originallyus · Nov 29, 2021 · de7e2eb · de7e2eb
2 parents 56f0664 + 95935bb
commit de7e2eb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/packages/core/content-manager/server/services/entity-manager.js b/packages/core/content-manager/server/services/entity-manager.js
@@ -212,7 +212,12 @@ module.exports = ({ strapi }) => ({
     }
 
     // validate the entity is valid for publication
-    await strapi.entityValidator.validateEntityCreation(strapi.getModel(uid), entity);
+    await strapi.entityValidator.validateEntityCreation(
+      strapi.getModel(uid),
+      entity,
+      undefined,
+      entity
+    );
 
     const data = { ...body, [PUBLISHED_AT_ATTRIBUTE]: new Date() };
 

diff --git a/packages/core/strapi/lib/services/entity-validator/validators.js b/packages/core/strapi/lib/services/entity-validator/validators.js
@@ -127,7 +127,7 @@ const addUniqueValidator = (validator, { attr, model, updatedAttribute, entity }
      * If the attribute value is `null` we want to skip the unique validation.
      * Otherwise it'll only accept a single `null` entry in the database.
      */
-    if (updatedAttribute.value === null) {
+    if (_.isNil(updatedAttribute.value)) {
       return true;
     }