diff --git a/src/pages/acceptInvitation/AcceptInvitationUserRoles.vue b/src/pages/acceptInvitation/AcceptInvitationUserRoles.vue index 779367654..0ebad39bd 100644 --- a/src/pages/acceptInvitation/AcceptInvitationUserRoles.vue +++ b/src/pages/acceptInvitation/AcceptInvitationUserRoles.vue @@ -14,8 +14,10 @@ {{ row.userGroupName }} - {{ row.dateStart }} - {{ row.dateEnd ? row.dateEnd : '---' }} + {{ formatShortDate(row.dateStart) }} + + {{ row.dateEnd ? formatShortDate(row.dateEnd) : '---' }} + {{ row.masthead @@ -38,9 +40,11 @@ import TableColumn from '@/components/Table/TableColumn.vue'; import TableBody from '@/components/Table/TableBody.vue'; import TableRow from '@/components/Table/TableRow.vue'; import {defineProps} from 'vue'; +import {useDate} from '@/composables/useDate'; defineProps({ userGroupsToAdd: {type: Array, required: true}, }); const {t} = useLocalize(); +const {formatShortDate} = useDate(); diff --git a/src/pages/userInvitation/UserInvitationUserGroupsTable.vue b/src/pages/userInvitation/UserInvitationUserGroupsTable.vue index 3362f51ff..6d2c400e4 100644 --- a/src/pages/userInvitation/UserInvitationUserGroupsTable.vue +++ b/src/pages/userInvitation/UserInvitationUserGroupsTable.vue @@ -19,13 +19,25 @@ {{ currentUserGroup.name }} - {{ currentUserGroup.dateStart ? currentUserGroup.dateStart : '---' }} + {{ + currentUserGroup.dateStart + ? formatShortDate(currentUserGroup.dateStart) + : '---' + }} - {{ currentUserGroup.dateEnd ? currentUserGroup.dateEnd : '---' }} + {{ + currentUserGroup.dateEnd + ? formatShortDate(currentUserGroup.dateEnd) + : '---' + }} - {{ currentUserGroup.masthead ? currentUserGroup.masthead : '---' }} + {{ + currentUserGroup.masthead + ? t('invitation.masthead.show') + : t('invitation.masthead.hidden') + }}