Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes: #18203 - Validate that scope is selected if scope type is specified #18254

Merged
merged 3 commits into from
Dec 30, 2024
Merged

Fixes: #18203 - Validate that scope is selected if scope type is specified #18254

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf82101
Validate that a scope has been selected if a scope_type is specified,…
bctiemann Dec 17, 2024
6a4c944
Cleaner logic
bctiemann Dec 18, 2024
a710cec
Call super().clean() after validating scope_type/scope
bctiemann Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions netbox/dcim/models/mixins.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
from django.apps import apps
from django.contrib.contenttypes.fields import GenericForeignKey
from django.core.exceptions import ValidationError
from django.db import models
from django.utils.translation import gettext_lazy as _
from dcim.constants import LOCATION_SCOPE_TYPES

__all__ = (
Expand Down Expand Up @@ -84,6 +86,16 @@ class CachedScopeMixin(models.Model):
class Meta:
abstract = True

def clean(self):
if self.scope_type and not self.scope:
scope_type = self.scope_type.model_class()
raise ValidationError({
'scope': _(
"Please select a {scope_type}."
).format(scope_type=scope_type._meta.model_name)
})
super().clean()

def save(self, *args, **kwargs):
# Cache objects associated with the terminating object (for filtering)
self.cache_related_objects()
Expand Down
Loading