Fixes: #4415 - Add site on validate_unique() for device model

This commit is contained in:
Daniel Sheppard
2020-03-27 08:37:48 -05:00
parent 4a6f82a2fd
commit 94bda93faa
2 changed files with 2 additions and 1 deletions

View File

@@ -1390,7 +1390,7 @@ class Device(ChangeLoggedModel, ConfigContextModel, CustomFieldModel):
# because Django does not consider two NULL fields to be equal, and thus will not trigger a violation
# of the uniqueness constraint without manual intervention.
if self.name and self.tenant is None:
if Device.objects.exclude(pk=self.pk).filter(name=self.name, tenant__isnull=True):
if Device.objects.exclude(pk=self.pk).filter(name=self.name, site=self.site, tenant__isnull=True):
raise ValidationError({
'name': 'A device with this name already exists.'
})