From 6a4c944e64093c05edd65e5dfa094c1dc3d403dc Mon Sep 17 00:00:00 2001 From: Brian Tiemann Date: Tue, 17 Dec 2024 21:12:48 -0500 Subject: [PATCH] Cleaner logic --- netbox/dcim/models/mixins.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/netbox/dcim/models/mixins.py b/netbox/dcim/models/mixins.py index 8bfa76572..5d686d110 100644 --- a/netbox/dcim/models/mixins.py +++ b/netbox/dcim/models/mixins.py @@ -87,14 +87,13 @@ class CachedScopeMixin(models.Model): abstract = True def clean(self): - if self.scope_type: + if self.scope_type and not self.scope: scope_type = self.scope_type.model_class() - if not self.scope: - raise ValidationError({ - 'scope': _( - "Please select a {scope_type}." - ).format(scope_type=scope_type._meta.model_name) - }) + raise ValidationError({ + 'scope': _( + "Please select a {scope_type}." + ).format(scope_type=scope_type._meta.model_name) + }) def save(self, *args, **kwargs): # Cache objects associated with the terminating object (for filtering)