Merge branch 'master' into develop

This commit is contained in:
Dane Everitt 2019-12-28 11:49:08 -08:00
commit 51defae917
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
15 changed files with 140 additions and 21 deletions

View file

@ -51,7 +51,7 @@ class NestDeletionService
{
$count = $this->serverRepository->findCountWhere([['nest_id', '=', $nest]]);
if ($count > 0) {
throw new HasActiveServersException(trans('exceptions.service.delete_has_servers'));
throw new HasActiveServersException(trans('exceptions.nest.delete_has_servers'));
}
return $this->repository->delete($nest);