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

Merge branch 'main' into feature/review-workflow

Browse Source
This commit is contained in:
Marc-Roig 2023-04-17 17:09:22 +02:00
commit d07a862ec4
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/tests.yml vendored
View File

@ -23,7 +23,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
matrix: matrix:
node: [14, 16, 18] node: [18]
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:

2
packages/core/content-type-builder/admin/src/translations/en.json
View File

@ -62,7 +62,7 @@
"error.contentTypeName.reserved-name": "This name cannot be used in your project as it might break other functionalities", "error.contentTypeName.reserved-name": "This name cannot be used in your project as it might break other functionalities",
"error.validation.enum-duplicate": "Duplicate values are not allowed (only alphanumeric characters are taken into account).", "error.validation.enum-duplicate": "Duplicate values are not allowed (only alphanumeric characters are taken into account).",
"error.validation.enum-empty-string": "Empty strings are not allowed", "error.validation.enum-empty-string": "Empty strings are not allowed",
"error.validation.enum-regex": "At least one value is invalid. Values should have at least one alphabetical character preceeding the first occurence of a number.", "error.validation.enum-regex": "At least one value is invalid. Values should have at least one alphabetical character preceding the first occurence of a number.",
"error.validation.minSupMax": "Can't be superior", "error.validation.minSupMax": "Can't be superior",
"error.validation.positive": "Must be a positive number", "error.validation.positive": "Must be a positive number",
"error.validation.regex": "Regex pattern is invalid", "error.validation.regex": "Regex pattern is invalid",

4
packages/core/database/lib/index.js
View File

@ -57,15 +57,15 @@ class Database {
async function commit() { async function commit() {
if (notNestedTransaction) { if (notNestedTransaction) {
await trx.commit();
transactionCtx.clear(); transactionCtx.clear();
await trx.commit();
} }
} }
async function rollback() { async function rollback() {
if (notNestedTransaction) { if (notNestedTransaction) {
await trx.rollback();
transactionCtx.clear(); transactionCtx.clear();
await trx.rollback();
} }
} }

2
packages/core/strapi/lib/core/domain/content-type/validator.js
View File

@ -61,7 +61,7 @@ const contentTypeSchemaValidator = yup.object().shape({
// should match the GraphQL regex // should match the GraphQL regex
if (!regressedValues.every((value) => GRAPHQL_ENUM_REGEX.test(value))) { if (!regressedValues.every((value) => GRAPHQL_ENUM_REGEX.test(value))) {
const message = `Invalid enumeration value. Values should have at least one alphabetical character preceeding the first occurence of a number. Update your enumeration '${attrName}'.`; const message = `Invalid enumeration value. Values should have at least one alphabetical character preceding the first occurence of a number. Update your enumeration '${attrName}'.`;
return this.createError({ message }); return this.createError({ message });
} }