diff options
Diffstat (limited to 'modern/src/settings')
-rw-r--r-- | modern/src/settings/DevicePage.js | 22 | ||||
-rw-r--r-- | modern/src/settings/UserPage.js | 2 | ||||
-rw-r--r-- | modern/src/settings/UsersPage.js | 4 |
3 files changed, 18 insertions, 10 deletions
diff --git a/modern/src/settings/DevicePage.js b/modern/src/settings/DevicePage.js index b54c7c81..49f765a7 100644 --- a/modern/src/settings/DevicePage.js +++ b/modern/src/settings/DevicePage.js @@ -1,6 +1,5 @@ import React, { useState } from 'react'; -import TextField from '@mui/material/TextField'; - +import moment from 'moment'; import { Accordion, AccordionSummary, @@ -8,6 +7,7 @@ import { Typography, FormControlLabel, Checkbox, + TextField, } from '@mui/material'; import makeStyles from '@mui/styles/makeStyles'; import ExpandMoreIcon from '@mui/icons-material/ExpandMore'; @@ -132,12 +132,18 @@ const DevicePage = () => { }))} label={t('deviceCategory')} /> - {admin && ( - <FormControlLabel - control={<Checkbox checked={item.disabled} onChange={(event) => setItem({ ...item, disabled: event.target.checked })} />} - label={t('sharedDisabled')} - /> - )} + <TextField + label={t('userExpirationTime')} + type="date" + value={(item.expirationTime && moment(item.expirationTime).locale('en').format(moment.HTML5_FMT.DATE)) || '2099-01-01'} + onChange={(e) => setItem({ ...item, expirationTime: moment(e.target.value, moment.HTML5_FMT.DATE).format() })} + disabled={!admin} + /> + <FormControlLabel + control={<Checkbox checked={item.disabled} onChange={(event) => setItem({ ...item, disabled: event.target.checked })} />} + label={t('sharedDisabled')} + disabled={!admin} + /> </AccordionDetails> </Accordion> {item.id && ( diff --git a/modern/src/settings/UserPage.js b/modern/src/settings/UserPage.js index 8bae2e59..392339d0 100644 --- a/modern/src/settings/UserPage.js +++ b/modern/src/settings/UserPage.js @@ -287,7 +287,7 @@ const UserPage = () => { <TextField label={t('userExpirationTime')} type="date" - value={(item.expirationTime && moment(item.expirationTime).format(moment.HTML5_FMT.DATE)) || '2999-01-01'} + value={(item.expirationTime && moment(item.expirationTime).locale('en').format(moment.HTML5_FMT.DATE)) || '2099-01-01'} onChange={(e) => setItem({ ...item, expirationTime: moment(e.target.value, moment.HTML5_FMT.DATE).format() })} disabled={!manager} /> diff --git a/modern/src/settings/UsersPage.js b/modern/src/settings/UsersPage.js index 5b2c1833..dc061adc 100644 --- a/modern/src/settings/UsersPage.js +++ b/modern/src/settings/UsersPage.js @@ -5,7 +5,7 @@ import { import LoginIcon from '@mui/icons-material/Login'; import makeStyles from '@mui/styles/makeStyles'; import { useCatch, useEffectAsync } from '../reactHelper'; -import { formatBoolean } from '../common/util/formatter'; +import { formatBoolean, formatTime } from '../common/util/formatter'; import { useTranslation } from '../common/components/LocalizationProvider'; import PageLayout from '../common/components/PageLayout'; import SettingsMenu from './components/SettingsMenu'; @@ -69,6 +69,7 @@ const UsersPage = () => { <TableCell>{t('userEmail')}</TableCell> <TableCell>{t('userAdmin')}</TableCell> <TableCell>{t('sharedDisabled')}</TableCell> + <TableCell>{t('userExpirationTime')}</TableCell> <TableCell className={classes.columnAction} /> </TableRow> </TableHead> @@ -79,6 +80,7 @@ const UsersPage = () => { <TableCell>{item.email}</TableCell> <TableCell>{formatBoolean(item.administrator, t)}</TableCell> <TableCell>{formatBoolean(item.disabled, t)}</TableCell> + <TableCell>{formatTime(item.expirationTime, 'YYYY-MM-DD')}</TableCell> <TableCell className={classes.columnAction} padding="none"> <CollectionActions itemId={item.id} |