Merge release v2.4.7 into develop-2.5

2018-11-06 11:05:04 -05:00
parent 01628cdd31 8bad25b860
commit ce00226bc6
9 changed files with 136 additions and 27 deletions
--- a/netbox/ipam/models.py
+++ b/netbox/ipam/models.py
@@ -587,11 +587,11 @@ class IPAddress(ChangeLoggedModel, CustomFieldModel):
        if self.address:

            # Enforce unique IP space (if applicable)
-            if self.role not in IPADDRESS_ROLES_NONUNIQUE and (
+            if self.role not in IPADDRESS_ROLES_NONUNIQUE and ((
                self.vrf is None and settings.ENFORCE_GLOBAL_UNIQUE
            ) or (
                self.vrf and self.vrf.enforce_unique
-            ):
+            )):
                duplicate_ips = self.get_duplicates()
                if duplicate_ips:
                    raise ValidationError({