Merge branch 'develop' into v2

This commit is contained in:
Matthew Penner 2021-08-04 21:40:38 -06:00
commit 4b32828423
No known key found for this signature in database
GPG key ID: 5396CC4C3C1C9704
7 changed files with 34 additions and 14 deletions

View file

@ -135,7 +135,7 @@ class InitiateBackupService
// Check if the server has reached or exceeded its backup limit.
// completed_at == null will cover any ongoing backups, while is_successful == true will cover any completed backups.
$successful = $this->getNonFailedBackups($server);
$successful = $this->repository->getNonFailedBackups($server);
if (!$server->backup_limit || $successful->count() >= $server->backup_limit) {
// Do not allow the user to continue if this server is already at its limit and can't override.
if (!$override || $server->backup_limit <= 0) {