Skip to content

Commit

Permalink
Merge pull request #10096 from arthanson/art-6454
Browse files Browse the repository at this point in the history
Fixes #6454 - Adds warning for prerequisite models
  • Loading branch information
jeremystretch authored Aug 22, 2022
2 parents 646272f + 25ec624 commit f35ff10
Show file tree
Hide file tree
Showing 16 changed files with 112 additions and 2 deletions.
5 changes: 5 additions & 0 deletions netbox/circuits/models/circuits.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from django.apps import apps
from django.contrib.contenttypes.fields import GenericRelation
from django.core.exceptions import ValidationError
from django.db import models
Expand Down Expand Up @@ -136,6 +137,10 @@ class Meta:
def __str__(self):
return self.cid

@classmethod
def get_prerequisite_models(cls):
return [apps.get_model('circuits.Provider'), CircuitType]

def get_absolute_url(self):
return reverse('circuits:circuit', args=[self.pk])

Expand Down
14 changes: 14 additions & 0 deletions netbox/dcim/models/devices.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import decimal

import yaml

from django.apps import apps
from django.contrib.contenttypes.fields import GenericRelation
from django.core.exceptions import ValidationError
from django.core.validators import MaxValueValidator, MinValueValidator
Expand Down Expand Up @@ -159,6 +161,10 @@ def __init__(self, *args, **kwargs):
self._original_front_image = self.front_image
self._original_rear_image = self.rear_image

@classmethod
def get_prerequisite_models(cls):
return [Manufacturer, ]

def get_absolute_url(self):
return reverse('dcim:devicetype', args=[self.pk])

Expand Down Expand Up @@ -338,6 +344,10 @@ class Meta:
def __str__(self):
return self.model

@classmethod
def get_prerequisite_models(cls):
return [Manufacturer, ]

def get_absolute_url(self):
return reverse('dcim:moduletype', args=[self.pk])

Expand Down Expand Up @@ -658,6 +668,10 @@ def __str__(self):
return f'{self.device_type.manufacturer} {self.device_type.model} ({self.pk})'
return super().__str__()

@classmethod
def get_prerequisite_models(cls):
return [apps.get_model('dcim.Site'), DeviceRole, DeviceType, ]

def get_absolute_url(self):
return reverse('dcim:device', args=[self.pk])

Expand Down
9 changes: 9 additions & 0 deletions netbox/dcim/models/power.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from django.apps import apps
from django.contrib.contenttypes.fields import GenericRelation
from django.core.exceptions import ValidationError
from django.core.validators import MaxValueValidator, MinValueValidator
Expand Down Expand Up @@ -54,6 +55,10 @@ class Meta:
def __str__(self):
return self.name

@classmethod
def get_prerequisite_models(cls):
return [apps.get_model('dcim.Site'), ]

def get_absolute_url(self):
return reverse('dcim:powerpanel', args=[self.pk])

Expand Down Expand Up @@ -138,6 +143,10 @@ class Meta:
def __str__(self):
return self.name

@classmethod
def get_prerequisite_models(cls):
return [PowerPanel, ]

def get_absolute_url(self):
return reverse('dcim:powerfeed', args=[self.pk])

Expand Down
9 changes: 9 additions & 0 deletions netbox/dcim/models/racks.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import decimal

from django.apps import apps
from django.contrib.auth.models import User
from django.contrib.contenttypes.fields import GenericRelation
from django.contrib.contenttypes.models import ContentType
Expand Down Expand Up @@ -201,6 +202,10 @@ def __str__(self):
return f'{self.name} ({self.facility_id})'
return self.name

@classmethod
def get_prerequisite_models(cls):
return [apps.get_model('dcim.Site'), ]

def get_absolute_url(self):
return reverse('dcim:rack', args=[self.pk])

Expand Down Expand Up @@ -477,6 +482,10 @@ class Meta:
def __str__(self):
return "Reservation for rack {}".format(self.rack)

@classmethod
def get_prerequisite_models(cls):
return [apps.get_model('dcim.Site'), Rack, ]

def get_absolute_url(self):
return reverse('dcim:rackreservation', args=[self.pk])

Expand Down
4 changes: 4 additions & 0 deletions netbox/dcim/models/sites.py
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,10 @@ def validate_unique(self, exclude=None):

super().validate_unique(exclude=exclude)

@classmethod
def get_prerequisite_models(cls):
return [Site, ]

def get_absolute_url(self):
return reverse('dcim:location', args=[self.pk])

Expand Down
8 changes: 8 additions & 0 deletions netbox/ipam/models/ip.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,10 @@ class Meta:
def __str__(self):
return f'AS{self.asn_with_asdot}'

@classmethod
def get_prerequisite_models(cls):
return [RIR, ]

def get_absolute_url(self):
return reverse('ipam:asn', args=[self.pk])

Expand Down Expand Up @@ -185,6 +189,10 @@ class Meta:
def __str__(self):
return str(self.prefix)

@classmethod
def get_prerequisite_models(cls):
return [RIR, ]

def get_absolute_url(self):
return reverse('ipam:aggregate', args=[self.pk])

Expand Down
5 changes: 5 additions & 0 deletions netbox/ipam/models/l2vpn.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from django.apps import apps
from django.contrib.contenttypes.fields import GenericRelation, GenericForeignKey
from django.contrib.contenttypes.models import ContentType
from django.core.exceptions import ValidationError
Expand Down Expand Up @@ -103,6 +104,10 @@ def __str__(self):
return f'{self.assigned_object} <> {self.l2vpn}'
return super().__str__()

@classmethod
def get_prerequisite_models(cls):
return [apps.get_model('ipam.L2VPN'), ]

def get_absolute_url(self):
return reverse('ipam:l2vpntermination', args=[self.pk])

Expand Down
8 changes: 8 additions & 0 deletions netbox/netbox/models/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,14 @@ class NetBoxFeatureSet(
class Meta:
abstract = True

@classmethod
def get_prerequisite_models(cls):
"""
Return a list of model types that are required to create this model or empty list if none. This is used for
showing prequisite warnings in the UI on the list and detail views.
"""
return []


#
# Base model classes
Expand Down
8 changes: 6 additions & 2 deletions netbox/netbox/views/generic/bulk_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
from utilities.views import GetReturnURLMixin
from .base import BaseMultiObjectView
from .mixins import ActionsMixin, TableMixin
from .utils import get_prerequisite_model

__all__ = (
'BulkComponentCreateView',
Expand Down Expand Up @@ -165,13 +166,16 @@ def get(self, request):
'table': table,
})

return render(request, self.template_name, {
context = {
'model': model,
'table': table,
'actions': actions,
'filter_form': self.filterset_form(request.GET, label_suffix='') if self.filterset_form else None,
'prerequisite_model': get_prerequisite_model(self.queryset),
**self.get_extra_context(request),
})
}

return render(request, self.template_name, context)


class BulkCreateView(GetReturnURLMixin, BaseMultiObjectView):
Expand Down
4 changes: 4 additions & 0 deletions netbox/netbox/views/generic/object_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
from utilities.views import GetReturnURLMixin
from .base import BaseObjectView
from .mixins import ActionsMixin, TableMixin
from .utils import get_prerequisite_model

__all__ = (
'ComponentCreateView',
Expand Down Expand Up @@ -340,15 +341,18 @@ def get(self, request, *args, **kwargs):
"""
obj = self.get_object(**kwargs)
obj = self.alter_object(obj, request, args, kwargs)
model = self.queryset.model

initial_data = normalize_querydict(request.GET)
form = self.form(instance=obj, initial=initial_data)
restrict_form_fields(form, request.user)

return render(request, self.template_name, {
'model': model,
'object': obj,
'form': form,
'return_url': self.get_return_url(request, obj),
'prerequisite_model': get_prerequisite_model(self.queryset),
**self.get_extra_context(request, obj),
})

Expand Down
12 changes: 12 additions & 0 deletions netbox/netbox/views/generic/utils.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
def get_prerequisite_model(queryset):
model = queryset.model

if not queryset.exists():
if hasattr(model, 'get_prerequisite_models'):
prerequisites = model.get_prerequisite_models()
if prerequisites:
for prereq in prerequisites:
if not prereq.objects.exists():
return prereq

return None
4 changes: 4 additions & 0 deletions netbox/templates/generic/object_edit.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@
</div>
{% endif %}

{% if prerequisite_model %}
{% include 'inc/missing_prerequisites.html' %}
{% endif %}

<form action="" method="post" enctype="multipart/form-data" class="form-object-edit mt-5">
{% csrf_token %}

Expand Down
5 changes: 5 additions & 0 deletions netbox/templates/generic/object_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,11 @@
<input type="hidden" name="return_url" value="{% if return_url %}{{ return_url }}{% else %}{{ request.path }}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}{% endif %}" />

{# Object table #}

{% if prerequisite_model %}
{% include 'inc/missing_prerequisites.html' %}
{% endif %}

<div class="card">
<div class="card-body" id="object_list">
{% include 'htmx/table.html' %}
Expand Down
6 changes: 6 additions & 0 deletions netbox/templates/inc/missing_prerequisites.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{% load buttons %}

<div class="alert alert-warning" role="alert">
<i class="mdi mdi-alert"></i> Before you can add a {{ model|meta:"verbose_name" }} you must first create a
<strong>{{ prerequisite_model|meta:"verbose_name"|title }}</strong> which can be added here: {% add_button prerequisite_model %}
</div>
8 changes: 8 additions & 0 deletions netbox/virtualization/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,10 @@ class Meta:
def __str__(self):
return self.name

@classmethod
def get_prerequisite_models(cls):
return [ClusterType, ]

def get_absolute_url(self):
return reverse('virtualization:cluster', args=[self.pk])

Expand Down Expand Up @@ -312,6 +316,10 @@ class Meta:
def __str__(self):
return self.name

@classmethod
def get_prerequisite_models(cls):
return [Cluster, ]

def get_absolute_url(self):
return reverse('virtualization:virtualmachine', args=[self.pk])

Expand Down
5 changes: 5 additions & 0 deletions netbox/wireless/models.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from django.apps import apps
from django.core.exceptions import ValidationError
from django.db import models
from django.urls import reverse
Expand Down Expand Up @@ -190,6 +191,10 @@ class Meta:
def __str__(self):
return f'#{self.pk}'

@classmethod
def get_prerequisite_models(cls):
return [apps.get_model('dcim.Interface'), ]

def get_absolute_url(self):
return reverse('wireless:wirelesslink', args=[self.pk])

Expand Down

0 comments on commit f35ff10

Please sign in to comment.