From 12e8e39023e6f1e7b2b0ed4f8c9b809ae99bc740 Mon Sep 17 00:00:00 2001 From: joker-x Date: Mon, 24 Aug 2020 07:41:19 +0200 Subject: [PATCH 1/5] Remove STRICT_TRANS_TABLES from sql_mode. Fix #936 #748 --- server/lib/knex.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/server/lib/knex.js b/server/lib/knex.js index 43cc7194..7240d312 100644 --- a/server/lib/knex.js +++ b/server/lib/knex.js @@ -17,6 +17,15 @@ const knex = require('knex')({ 'DATETIME' ] }, + pool: { + min: 2, + max: 10, + afterCreate: function(conn, cb) { + conn.query('SET sql_mode="ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION";', function (err) { + cb(err, conn); + }); + } + }, migrations: { directory: path.join(__dirname, '..', 'setup', 'knex', 'migrations') } From 66d51df1d71f09fc93c8c60d6a593b9295f176bd Mon Sep 17 00:00:00 2001 From: joker-x Date: Mon, 24 Aug 2020 08:00:33 +0200 Subject: [PATCH 2/5] Activate DateFormat.INTL --- client/src/lists/fields/CUD.js | 3 ++- server/models/fields.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/client/src/lists/fields/CUD.js b/client/src/lists/fields/CUD.js index 45864ee7..0dd31991 100644 --- a/client/src/lists/fields/CUD.js +++ b/client/src/lists/fields/CUD.js @@ -425,7 +425,8 @@ export default class CUD extends Component { Default value used when the field is empty.}/> diff --git a/server/models/fields.js b/server/models/fields.js index 2f7148eb..0cf69d0c 100644 --- a/server/models/fields.js +++ b/server/models/fields.js @@ -234,7 +234,7 @@ fieldTypes.option = { fieldTypes['date'] = { validate: field => { - enforce(['eur', 'us'].includes(field.settings.dateFormat), 'Date format incorrect'); + enforce(['eur', 'us', 'intl'].includes(field.settings.dateFormat), 'Date format incorrect'); }, addColumn: (table, name) => table.dateTime(name), indexed: true, From 2f427a67dd0b588ca2f0f825f007c77ea409a501 Mon Sep 17 00:00:00 2001 From: joker-x Date: Wed, 26 Aug 2020 01:02:15 +0200 Subject: [PATCH 3/5] Show moment text in selected language --- client/src/lib/i18n.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/client/src/lib/i18n.js b/client/src/lib/i18n.js index f734f1ce..68101e5e 100644 --- a/client/src/lib/i18n.js +++ b/client/src/lib/i18n.js @@ -6,6 +6,7 @@ import {I18nextProvider} from 'react-i18next'; import i18n from 'i18next'; import LanguageDetector from 'i18next-browser-languagedetector'; import mailtrainConfig from 'mailtrainConfig'; +import moment from 'moment'; import {convertToFake, getLang} from '../../../shared/langs'; import {createComponentMixin} from "./decorator-helpers"; @@ -63,6 +64,8 @@ i18n debug: false }); +// Show moment text in selected language +moment.locale(i18n.language); export default i18n; From 02d2b215f28408f4a19cb6217305a74caacbc21c Mon Sep 17 00:00:00 2001 From: joker-x Date: Wed, 9 Sep 2020 17:31:16 +0200 Subject: [PATCH 4/5] Change format date from ISO-8601 to "YYYY-MM-DD HH:mm:ss" for save in database without ER_TRUNCATED_WRONG_VALUE error --- server/lib/knex.js | 6 +----- server/models/subscriptions.js | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/server/lib/knex.js b/server/lib/knex.js index 7240d312..519ea5a0 100644 --- a/server/lib/knex.js +++ b/server/lib/knex.js @@ -19,11 +19,7 @@ const knex = require('knex')({ }, pool: { min: 2, - max: 10, - afterCreate: function(conn, cb) { - conn.query('SET sql_mode="ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION";', function (err) { - cb(err, conn); - }); + max: 10 } }, migrations: { diff --git a/server/models/subscriptions.js b/server/models/subscriptions.js index 57f36f97..4f475f64 100644 --- a/server/models/subscriptions.js +++ b/server/models/subscriptions.js @@ -62,7 +62,7 @@ fieldTypes.date = { afterJSON: (groupedField, entity) => { const key = getFieldColumn(groupedField); if (key in entity) { - entity[key] = entity[key] ? moment(entity[key]).toISOString() : null; + entity[key] = entity[key] ? moment(entity[key]).utc().format("YYYY-MM-DD HH:mm:ss") : null; } }, listRender: (groupedField, value) => formatDate(groupedField.settings.dateFormat, value) @@ -72,7 +72,7 @@ fieldTypes.birthday = { afterJSON: (groupedField, entity) => { const key = getFieldColumn(groupedField); if (key in entity) { - entity[key] = entity[key] ? moment(entity[key]).toISOString() : null; + entity[key] = entity[key] ? moment(entity[key]).utc().format("YYYY-MM-DD HH:mm:ss") : null; } }, listRender: (groupedField, value) => formatBirthday(groupedField.settings.dateFormat, value) From 240b08eaeab35926881c2d61e813fe814be9365f Mon Sep 17 00:00:00 2001 From: joker-x Date: Thu, 10 Sep 2020 14:21:23 +0200 Subject: [PATCH 5/5] Clean --- server/lib/knex.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/server/lib/knex.js b/server/lib/knex.js index 519ea5a0..43cc7194 100644 --- a/server/lib/knex.js +++ b/server/lib/knex.js @@ -17,11 +17,6 @@ const knex = require('knex')({ 'DATETIME' ] }, - pool: { - min: 2, - max: 10 - } - }, migrations: { directory: path.join(__dirname, '..', 'setup', 'knex', 'migrations') }