public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Activate DateFormat.INTL

Browse source
This commit is contained in:
joker-x 2020-08-24 08:00:33 +02:00
parent 12e8e39023
commit 66d51df1d7
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
client/src/lists/fields/CUD.js
View file

@ -425,7 +425,8 @@ export default class CUD extends Component {
<Dropdown id="dateFormat" label={t('dateFormat')} <Dropdown id="dateFormat" label={t('dateFormat')}
options={[ options={[
{key: DateFormat.US, label: t('mmddyyyy')}, {key: DateFormat.US, label: t('mmddyyyy')},
{key: DateFormat.EU, label: t('ddmmyyyy')} {key: DateFormat.EU, label: t('ddmmyyyy')},
{key: DateFormat.INTL, label: t('YYYY-MM-DD')}
]} ]}
/> />
<InputField id="default_value" label={t('defaultValue')} help={<Trans i18nKey="defaultValueUsedWhenTheFieldIsEmpty">Default value used when the field is empty.</Trans>}/> <InputField id="default_value" label={t('defaultValue')} help={<Trans i18nKey="defaultValueUsedWhenTheFieldIsEmpty">Default value used when the field is empty.</Trans>}/>

2
server/models/fields.js
View file

@ -234,7 +234,7 @@ fieldTypes.option = {
fieldTypes['date'] = { fieldTypes['date'] = {
validate: field => { 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), addColumn: (table, name) => table.dateTime(name),
indexed: true, indexed: true,