Merge branch 'develop-2.10' into 4878-custom-fields

This commit is contained in:
Jeremy Stretch
2020-09-04 16:14:06 -04:00
47 changed files with 465 additions and 118 deletions

View File

@@ -623,7 +623,7 @@ class Device(ChangeLoggedModel, ConfigContextModel, CustomFieldModel):
# Check for a duplicate name on a device assigned to the same Site and no Tenant. This is necessary
# 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 self.name and hasattr(self, 'site') and self.tenant is None:
if Device.objects.exclude(pk=self.pk).filter(
name=self.name,
site=self.site,