Merge branch 'develop' into feature/react-admin

This commit is contained in:
Matthew Penner 2021-03-12 14:13:22 -07:00
commit 2e046ae258
6 changed files with 25 additions and 14 deletions

View file

@ -65,12 +65,12 @@ const BackupContainer = () => {
}
<Can action={'backup.create'}>
<div css={tw`mt-6 sm:flex items-center justify-end`}>
{(backupLimit > 0 && backups.items.length > 0) &&
{(backupLimit > 0 && backups.pagination.total > 0) &&
<p css={tw`text-sm text-neutral-300 mb-4 sm:mr-6 sm:mb-0`}>
{backups.items.length} of {backupLimit} backups have been created for this server.
{backups.pagination.total} of {backupLimit} backups have been created for this server.
</p>
}
{backupLimit > 0 && backupLimit !== backups.items.length &&
{backupLimit > 0 && backupLimit !== backups.pagination.total &&
<CreateBackupButton css={tw`w-full sm:w-auto`}/>
}
</div>