Skip to content
Snippets Groups Projects
Commit e7b064a1 authored by Tore.Brede's avatar Tore.Brede
Browse files

Merge branch 'fix_sent_invitations_details' into 'master'

Fixing bug where details button was not shown

See merge request !131
parents ef3aec75 663a4e51
No related branches found
No related tags found
1 merge request!131Fixing bug where details button was not shown
Pipeline #98967 passed
...@@ -75,7 +75,16 @@ const PersonLine = ({ ...@@ -75,7 +75,16 @@ const PersonLine = ({
{i18n.language === 'en' ? role.ou_en : role.ou_nb} {i18n.language === 'en' ? role.ou_en : role.ou_nb}
</TableCell> </TableCell>
<TableCell align="left"> <TableCell align="left">
{displayCancel ? ( <Button
variant="contained"
component={Link}
to={`/sponsor/guest/${person.pid}`}
>
{t('common:details')}
</Button>
</TableCell>
{displayCancel && (
<TableCell align="left">
<Button <Button
data-testid="button-invite-cancel" data-testid="button-invite-cancel"
sx={{ color: 'theme.palette.secondary', mr: 1 }} sx={{ color: 'theme.palette.secondary', mr: 1 }}
...@@ -87,16 +96,8 @@ const PersonLine = ({ ...@@ -87,16 +96,8 @@ const PersonLine = ({
> >
{t('common:button.cancel')} {t('common:button.cancel')}
</Button> </Button>
) : ( </TableCell>
<Button )}
variant="contained"
component={Link}
to={`/sponsor/guest/${person.pid}`}
>
{t('common:details')}
</Button>
)}
</TableCell>
</TableRow> </TableRow>
) )
} }
...@@ -142,6 +143,9 @@ const WaitingForGuestRegistration = ({ ...@@ -142,6 +143,9 @@ const WaitingForGuestRegistration = ({
<TableCell align="left">{t('common:period')}</TableCell> <TableCell align="left">{t('common:period')}</TableCell>
<TableCell align="left">{t('common:ou')}</TableCell> <TableCell align="left">{t('common:ou')}</TableCell>
<TableCell align="left">{t('common:choice')}</TableCell> <TableCell align="left">{t('common:choice')}</TableCell>
<TableCell align="left">
{t('common:button.cancelInvitation')}
</TableCell>
</TableRow> </TableRow>
</TableHead> </TableHead>
<TableBody> <TableBody>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment